diff options
| author | techknowlogick <techknowlogick@users.noreply.github.com> | 2017-11-28 17:17:23 -0500 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-11-29 00:17:23 +0200 |
| commit | d39b88ae886bb4a25e4a488bd1d1db9c1a4eedba (patch) | |
| tree | 3812e02938587ca4698fc69527dbf15eb39d10bb | |
| parent | d99f4ab0035631aacc44739af0a936e59daf83b7 (diff) | |
| download | gitea-d39b88ae886bb4a25e4a488bd1d1db9c1a4eedba.tar.gz gitea-d39b88ae886bb4a25e4a488bd1d1db9c1a4eedba.zip | |
Fix master build for docs docker (#3004)
| -rw-r--r-- | .drone.yml | 2 | ||||
| -rw-r--r-- | docs/Dockerfile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.drone.yml b/.drone.yml index 5c7f9f8e21..8fd91ebfcb 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 35e4ce9a6a..c69a9214e4 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"] |