codevalet
/
master
mirror of https://github.com/codevalet/master
1
0
Fork 0
Code Issues Releases Wiki Activity

Forgot to remove some things which went to the base container

This commit is contained in:
R. Tyler Croy 2017-12-21 09:17:22 -08:00
parent bdb8b8c7bb
commit dee43134e2
No known key found for this signature in database
GPG Key ID: 1426C7DC3F51E16F
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -71,15 +71,3 @@ RUN date > /usr/share/jenkins/ref/userContent/builtOn.txt
ADD build/git-refs.txt /usr/share/jenkins/ref/userContent
RUN for f in /usr/share/jenkins/ref/userContent/*.txt; do mv $f $f.override ; done
################################################################################
# Prepare the nginx instance itself
################################################################################
COPY nginx.conf /etc/nginx/conf.d/default.conf
################################################################################
# Prepare the supervisor script to run nginx and Jenkins inside the container
################################################################################
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
CMD /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
################################################################################