Fix master build for docs docker (#3004)
This commit is contained in:
parent
d99f4ab003
commit
d39b88ae88
2 changed files with 4 additions and 2 deletions
|
@ -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:
|
||||
|
|
|
@ -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"]
|
||||
|
|
Reference in a new issue