Build on RHEL and move from caddy to nginx #297
Merged
Conversation
This file contains 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
Enables build on RHEL if TARGET=rhel: - The build scripts will be executed twice on the same machine, once for CentOS and one for RHEL - `docker login` is required to run `docker build` - The image target is different if TARGET=rhel - There is a separate Dockerfile for the RHEL build Additionally, it replaces caddy with nginx as the static web server, to match other services in OSIO.
chmouel
reviewed
Apr 25, 2018
| ls -al /var/lib/nginx/ | ||
| ls -al /var/log/nginx/ | ||
|
|
||
| nginx -c /etc/nginx/nginx.conf |
There was a problem hiding this comment.
shuould not be an exec when you run as pid1?
There was a problem hiding this comment.
I used the same template as this one: https://github.com/fabric8-ui/fabric8-ui-openshift-nginx/blob/master/Dockerfile, which is in turn based on https://github.com/kbsingh/openshift-nginx, which has exactly that run.sh:
https://github.com/kbsingh/openshift-nginx/blob/master/root/run.sh
All the nginx based containers that I've seen in OSIO are using this entrypoint.
You may be right though, and I'm all in favour of improving this if need be, but I have tested this and it does work, can we get through this PR and address this at a later stage?
|
[test] |
13 tasks
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.
Enables build on RHEL if TARGET=rhel:
CentOS and one for RHEL
docker loginis required to rundocker buildAdditionally, it replaces caddy with nginx as the static web server, to match
other services in OSIO.
When this is merged it will be automatically deployed to staging based on RHEL,
but prod will be kept on CentOS.