From dab38c375df5c4719d35f1be29278d254d68390f Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Mon, 6 May 2019 04:49:32 +0200 Subject: [PATCH] [docker] drop the docker Makefile from the image (#6507) --- Dockerfile | 2 +- docker/{ => root}/etc/nsswitch.conf | 0 docker/{ => root}/etc/profile.d/gitea.sh | 0 docker/{ => root}/etc/s6/.s6-svscan/finish | 0 docker/{ => root}/etc/s6/gitea/finish | 0 docker/{ => root}/etc/s6/gitea/run | 0 docker/{ => root}/etc/s6/gitea/setup | 0 docker/{ => root}/etc/s6/openssh/finish | 0 docker/{ => root}/etc/s6/openssh/run | 0 docker/{ => root}/etc/s6/openssh/setup | 0 docker/{ => root}/etc/ssh/sshd_config | 0 docker/{ => root}/etc/templates/app.ini | 0 docker/{ => root}/usr/bin/entrypoint | 0 13 files changed, 1 insertion(+), 1 deletion(-) rename docker/{ => root}/etc/nsswitch.conf (100%) rename docker/{ => root}/etc/profile.d/gitea.sh (100%) rename docker/{ => root}/etc/s6/.s6-svscan/finish (100%) rename docker/{ => root}/etc/s6/gitea/finish (100%) rename docker/{ => root}/etc/s6/gitea/run (100%) rename docker/{ => root}/etc/s6/gitea/setup (100%) rename docker/{ => root}/etc/s6/openssh/finish (100%) rename docker/{ => root}/etc/s6/openssh/run (100%) rename docker/{ => root}/etc/s6/openssh/setup (100%) rename docker/{ => root}/etc/ssh/sshd_config (100%) rename docker/{ => root}/etc/templates/app.ini (100%) rename docker/{ => root}/usr/bin/entrypoint (100%) diff --git a/Dockerfile b/Dockerfile index e1d2ea8412..1aae5fc6d4 100644 --- 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 b/docker/root/etc/nsswitch.conf similarity index 100% rename from docker/etc/nsswitch.conf rename to docker/root/etc/nsswitch.conf diff --git a/docker/etc/profile.d/gitea.sh b/docker/root/etc/profile.d/gitea.sh similarity index 100% rename from docker/etc/profile.d/gitea.sh rename to docker/root/etc/profile.d/gitea.sh diff --git a/docker/etc/s6/.s6-svscan/finish b/docker/root/etc/s6/.s6-svscan/finish similarity index 100% rename from docker/etc/s6/.s6-svscan/finish rename to docker/root/etc/s6/.s6-svscan/finish diff --git a/docker/etc/s6/gitea/finish b/docker/root/etc/s6/gitea/finish similarity index 100% rename from docker/etc/s6/gitea/finish rename to docker/root/etc/s6/gitea/finish diff --git a/docker/etc/s6/gitea/run b/docker/root/etc/s6/gitea/run similarity index 100% rename from docker/etc/s6/gitea/run rename to docker/root/etc/s6/gitea/run diff --git a/docker/etc/s6/gitea/setup b/docker/root/etc/s6/gitea/setup similarity index 100% rename from docker/etc/s6/gitea/setup rename to docker/root/etc/s6/gitea/setup diff --git a/docker/etc/s6/openssh/finish b/docker/root/etc/s6/openssh/finish similarity index 100% rename from docker/etc/s6/openssh/finish rename to docker/root/etc/s6/openssh/finish diff --git a/docker/etc/s6/openssh/run b/docker/root/etc/s6/openssh/run similarity index 100% rename from docker/etc/s6/openssh/run rename to docker/root/etc/s6/openssh/run diff --git a/docker/etc/s6/openssh/setup b/docker/root/etc/s6/openssh/setup similarity index 100% rename from docker/etc/s6/openssh/setup rename to docker/root/etc/s6/openssh/setup diff --git a/docker/etc/ssh/sshd_config b/docker/root/etc/ssh/sshd_config similarity index 100% rename from docker/etc/ssh/sshd_config rename to docker/root/etc/ssh/sshd_config diff --git a/docker/etc/templates/app.ini b/docker/root/etc/templates/app.ini similarity index 100% rename from docker/etc/templates/app.ini rename to docker/root/etc/templates/app.ini diff --git a/docker/usr/bin/entrypoint b/docker/root/usr/bin/entrypoint similarity index 100% rename from docker/usr/bin/entrypoint rename to docker/root/usr/bin/entrypoint