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

go-gitea · May 6, 2019 · dab38c3 · dab38c3
1 parent 0081cd8
commit dab38c3
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 1 deletion.
diff --git 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
diff --git a/docker/etc/nsswitch.conf → docker/root/etc/nsswitch.conf b/docker/etc/nsswitch.conf → docker/root/etc/nsswitch.conf
diff --git a/docker/etc/profile.d/gitea.sh → docker/root/etc/profile.d/gitea.sh b/docker/etc/profile.d/gitea.sh → docker/root/etc/profile.d/gitea.sh
diff --git a/docker/etc/s6/.s6-svscan/finish → docker/root/etc/s6/.s6-svscan/finish b/docker/etc/s6/.s6-svscan/finish → docker/root/etc/s6/.s6-svscan/finish
diff --git a/docker/etc/s6/gitea/finish → docker/root/etc/s6/gitea/finish b/docker/etc/s6/gitea/finish → docker/root/etc/s6/gitea/finish
diff --git a/docker/etc/s6/gitea/run → docker/root/etc/s6/gitea/run b/docker/etc/s6/gitea/run → docker/root/etc/s6/gitea/run
diff --git a/docker/etc/s6/gitea/setup → docker/root/etc/s6/gitea/setup b/docker/etc/s6/gitea/setup → docker/root/etc/s6/gitea/setup
diff --git a/docker/etc/s6/openssh/finish → docker/root/etc/s6/openssh/finish b/docker/etc/s6/openssh/finish → docker/root/etc/s6/openssh/finish
diff --git a/docker/etc/s6/openssh/run → docker/root/etc/s6/openssh/run b/docker/etc/s6/openssh/run → docker/root/etc/s6/openssh/run
diff --git a/docker/etc/s6/openssh/setup → docker/root/etc/s6/openssh/setup b/docker/etc/s6/openssh/setup → docker/root/etc/s6/openssh/setup
diff --git a/docker/etc/ssh/sshd_config → docker/root/etc/ssh/sshd_config b/docker/etc/ssh/sshd_config → docker/root/etc/ssh/sshd_config
diff --git a/docker/etc/templates/app.ini → docker/root/etc/templates/app.ini b/docker/etc/templates/app.ini → docker/root/etc/templates/app.ini
diff --git a/docker/usr/bin/entrypoint → docker/root/usr/bin/entrypoint b/docker/usr/bin/entrypoint → docker/root/usr/bin/entrypoint