Skip to content

Commit

Permalink
!#107 Fix: path for templates of docker
Browse files Browse the repository at this point in the history
  • Loading branch information
luismayta committed Nov 23, 2017
1 parent 2c258ae commit 50b3b1f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions provision/docker/app-test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ RUN apk add --update --no-cache --virtual .build-deps \
&& rm -rf /etc/nginx/conf.d/default.conf

# Copy the modified Nginx conf
COPY docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
COPY docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
COPY provision/docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
COPY provision/docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
# Custom Supervisord config
COPY docker/templates/etc/supervisord.conf /etc/
COPY docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY provision/docker/templates/etc/supervisord.conf /etc/
COPY provision/docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf

EXPOSE 80

Expand Down
8 changes: 4 additions & 4 deletions provision/docker/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ RUN apk add --update --no-cache --virtual .build-deps \
&& rm -rf /etc/nginx/conf.d/default.conf

# Copy the modified Nginx conf
COPY docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
COPY docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
COPY provision/docker/templates/etc/nginx/nginx.conf /etc/nginx/nginx.conf
COPY provision/docker/templates/etc/nginx/conf.d/nginx.conf /etc/nginx/conf.d/
# Custom Supervisord config
COPY docker/templates/etc/supervisord.conf /etc/
COPY docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY provision/docker/templates/etc/supervisord.conf /etc/
COPY provision/docker/templates/etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf

EXPOSE 80

Expand Down

0 comments on commit 50b3b1f

Please sign in to comment.