Skip to content

Commit

Permalink
[Docker] Minor fixes in Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
andrerom committed Aug 18, 2017
1 parent f56928f commit 20a92e6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doc/docker/Dockerfile-nginx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN composer run-script post-install-cmd --no-interaction

# Copy over just the files we want in second stage, so resulting stage only has assets
# and vhost config in as few layers as possible
FROM nginx:stable-alpine as web-multilayers
FROM nginx:stable as web-multilayers

COPY bin/vhost.sh /var/www/bin/vhost.sh
COPY doc/nginx/vhost.template /var/www/doc/nginx/vhost.template
Expand Down
5 changes: 3 additions & 2 deletions doc/docker/Dockerfile-varnish
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ ENV DEBIAN_FRONTEND noninteractive

# Use packages from Varnish to get Varnsih 5.1, 5.0 packages with debian:stretch gives segmentation faults
RUN apt-get update -q -y && \
apt-get install -q -y --force-yes --no-install-recommends ca-certificates curl && \
apt-get install -q -y --no-install-recommends ca-certificates curl && \
curl -s https://packagecloud.io/install/repositories/varnishcache/varnish5/script.deb.sh | bash && \
apt-get install -q -y --force-yes --no-install-recommends varnish
apt-get install -q -y --allow-unauthenticated --no-install-recommends varnish && \
rm -rf /var/lib/apt/lists/*

COPY doc/varnish/vcl/varnish4.vcl /etc/varnish/default.vcl
COPY doc/docker/entrypoint/varnish/parameters.vcl /etc/varnish/parameters.vcl
Expand Down
4 changes: 4 additions & 0 deletions doc/docker/varnish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ services:
- "8081:80"
depends_on:
- web
- app
networks:
- frontend
- backend


## DEBUG??
Expand Down

0 comments on commit 20a92e6

Please sign in to comment.