From d39b88ae886bb4a25e4a488bd1d1db9c1a4eedba Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 28 Nov 2017 17:17:23 -0500 Subject: [PATCH] Fix master build for docs docker (#3004) --- .drone.yml | 2 ++ docs/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5c7f9f8e218..8fd91ebfcb1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -194,6 +194,7 @@ pipeline: pull: true secrets: [ docker_username, docker_password ] repo: gitea/docs + context: docs dockerfile: docs/Dockerfile tags: [ '${DRONE_BRANCH##release/v}' ] when: @@ -205,6 +206,7 @@ pipeline: pull: true secrets: [ docker_username, docker_password ] repo: gitea/docs + context: docs dockerfile: docs/Dockerfile tags: [ 'latest' ] when: diff --git a/docs/Dockerfile b/docs/Dockerfile index 35e4ce9a6a1..c69a9214e47 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -16,7 +16,7 @@ EXPOSE 80 RUN apk add --no-cache wget mailcap ca-certificates COPY --from=build-env /go/bin/caddy /usr/sbin/caddy -COPY docs/docker/caddy.conf /etc/caddy.conf -COPY docs/public /srv/www +COPY docker/caddy.conf /etc/caddy.conf +COPY public /srv/www CMD ["/usr/sbin/caddy", "-conf", "/etc/caddy.conf"]