Skip to content

Dockerfile for docs copy proper files into image #2989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 27, 2017
Merged

Dockerfile for docs copy proper files into image #2989

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f6c3dd
Dockerfile for docs copy proper files into image
techknowlogick Nov 27, 2017
ec27e08
Merge branch 'master' into patch-3
techknowlogick Nov 27, 2017
7aa175a
Merge branch 'master' into patch-3
techknowlogick Nov 27, 2017
de4e434
Merge branch 'master' into patch-3
lunny Nov 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 docker/caddy.conf /etc/caddy.conf
COPY public /srv/www
COPY docs/docker/caddy.conf /etc/caddy.conf
COPY docs/public /srv/www

CMD ["/usr/sbin/caddy", "-conf", "/etc/caddy.conf"]