Rebase generic off monolithic #112
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-----DO NOT MERGE UNTIL UPDATING DOCKERFILE TO LATEST------ This commit rebases the generic code off the monolithic image This allows the base image to be the more regularly accessed / edited image removing the minor map changes directly in this generic image Commits to lancachenet/monolithic:switcheroo will mimic this commit Also fixes #108
GotenXiao
reviewed
Aug 18, 2021
Dockerfile
Outdated
| @@ -1,8 +1,9 @@ | |||
| FROM lancachenet/ubuntu-nginx:latest | |||
| MAINTAINER LanCache.Net Team <team@lancache.net> | |||
| FROM lancachenet/monolithic:switcheroo | |||
Member
There was a problem hiding this comment.
One option to make this more flexible:
ARG MONOLITHIC_TAG=master
FROM lancachenet/monolithic:${MONOLITHIC_TAG}We could potentially leverage the current branch name with this (e.g. attempt to pull lancachenet/monolithic:$GITHUB_HEAD_REF, if that works then pass --build-arg MONOLITHIC_TAG="${GITHUB_HEAD_REF}" when building the image; this would allow automatically leveraging matched-name branches on monolithic for pull requests on generic).
Member
Author
There was a problem hiding this comment.
I like this, but don't want to make the change now
Co-authored-by: GotenXiao <gotenxiao@gmail.com>
Disable build children as no dependencies
Rebase from monolithic:latest ready for final merge
Member
Author
|
Build was actually succesful in https://app.circleci.com/pipelines/github/lancachenet/generic/95/workflows/d25085b5-e98d-48c1-8fb7-05ea697f21a1/jobs/211 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit rebases the generic code off the monolithic image
This allows the base image to be the more regularly accessed / edited image
removing the minor map changes directly in this generic image
Commits to lancachenet/monolithic:switcheroo will mimic this commit (lancachenet/monolithic#133)
Also fixes #108