[docker] drop the docker Makefile from the image (#6507)

dab38c37 · Jakob Ackermann · techknowlogick · 0081cd8d · dab38c37 · dab38c37
Commit dab38c37 authored 6 years ago by Jakob Ackermann Committed by techknowlogick 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 1 deletion
+1 -1
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,6 +56,6 @@ VOLUME ["/data"]
 ENTRYPOINT ["/usr/bin/entrypoint"]
 CMD ["/bin/s6-svscan", "/etc/s6"]

-COPY docker /
+COPY docker/root /
 COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea
 RUN ln -s /app/gitea/gitea /usr/local/bin/gitea
--- a/docker/etc/nsswitch.conf
+++ b/docker/etc/nsswitch.conf
--- a/docker/etc/profile.d/gitea.sh
+++ b/docker/etc/profile.d/gitea.sh
--- a/docker/etc/s6/.s6-svscan/finish
+++ b/docker/etc/s6/.s6-svscan/finish
--- a/docker/etc/s6/gitea/finish
+++ b/docker/etc/s6/gitea/finish
--- a/docker/etc/s6/gitea/run
+++ b/docker/etc/s6/gitea/run
--- a/docker/etc/s6/gitea/setup
+++ b/docker/etc/s6/gitea/setup
--- a/docker/etc/s6/openssh/finish
+++ b/docker/etc/s6/openssh/finish
--- a/docker/etc/s6/openssh/run
+++ b/docker/etc/s6/openssh/run
--- a/docker/etc/s6/openssh/setup
+++ b/docker/etc/s6/openssh/setup
--- a/docker/etc/ssh/sshd_config
+++ b/docker/etc/ssh/sshd_config
--- a/docker/etc/templates/app.ini
+++ b/docker/etc/templates/app.ini
--- a/docker/usr/bin/entrypoint
+++ b/docker/usr/bin/entrypoint