sanctureplicum
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix master build for docs docker (#3004)

release
techknowlogick 2017-11-28 17:17:23 -05:00 committed by Lauris BH
parent d99f4ab003
commit d39b88ae88
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
Unescape Escape View File

@ -194,6 +194,7 @@ pipeline:
pull: true pull: true
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
repo: gitea/docs repo: gitea/docs
context: docs
dockerfile: docs/Dockerfile dockerfile: docs/Dockerfile
tags: [ '${DRONE_BRANCH##release/v}' ] tags: [ '${DRONE_BRANCH##release/v}' ]
when: when:
@ -205,6 +206,7 @@ pipeline:
pull: true pull: true
secrets: [ docker_username, docker_password ] secrets: [ docker_username, docker_password ]
repo: gitea/docs repo: gitea/docs
context: docs
dockerfile: docs/Dockerfile dockerfile: docs/Dockerfile
tags: [ 'latest' ] tags: [ 'latest' ]
when: when:

4
docs/Dockerfile
Unescape Escape View File

@ -16,7 +16,7 @@ EXPOSE 80
RUN apk add --no-cache wget mailcap ca-certificates RUN apk add --no-cache wget mailcap ca-certificates
COPY --from=build-env /go/bin/caddy /usr/sbin/caddy COPY --from=build-env /go/bin/caddy /usr/sbin/caddy
COPY docs/docker/caddy.conf /etc/caddy.conf COPY docker/caddy.conf /etc/caddy.conf
COPY docs/public /srv/www COPY public /srv/www
CMD ["/usr/sbin/caddy", "-conf", "/etc/caddy.conf"] CMD ["/usr/sbin/caddy", "-conf", "/etc/caddy.conf"]