From 9e7a669d5b84a0043e98f8c8243774626b9b1862 Mon Sep 17 00:00:00 2001 From: Eric Pfeiffer Date: Tue, 19 Jul 2016 22:01:20 -0500 Subject: [PATCH] incorporate upstream changes. --- caddy/Dockerfile | 4 +++- docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/caddy/Dockerfile b/caddy/Dockerfile index 9de6557..0694237 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -3,7 +3,9 @@ MAINTAINER Eric Pfeiffer LABEL caddy_version="0.9.0" architecture="amd64" -RUN apk add --update openssh-client tar curl +RUN apk update \ + && apk upgrade \ + && apk add tar curl RUN curl --silent --show-error --fail --location \ --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \ diff --git a/docker-compose.yml b/docker-compose.yml index 32bfddc..0426195 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -167,7 +167,7 @@ services: caddy: build: ./caddy volumes_from: - - application + - volumes_source ports: - "80:80" - "443:443"