From 32b3253edb617bbaeadc5e16fb83b0ddaae634ee Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 4 Apr 2019 10:01:59 +0200 Subject: [PATCH 1/3] [docker] drop the docker Makefile from the image Signed-off-by: Jakob Ackermann --- .dockerignore | 1 + Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000000..1cf4c6dbc8e5 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +/docker/Makefile diff --git a/Makefile b/Makefile index b8d156b76c7a..9f47f68e8261 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ strip-suffix = $(firstword $(subst ., ,$(1))) .PHONY: all all: build -include docker/Makefile +-include docker/Makefile .PHONY: clean clean: From 2e28b59a81fbb2e6b60ff7e303b9a1e0089131b1 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Sat, 13 Apr 2019 15:48:20 +0200 Subject: [PATCH 2/3] [docker] move the files for the final image into docker/root Signed-off-by: Jakob Ackermann --- .dockerignore | 1 - 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/s6/syslogd/finish | 0 docker/{ => root}/etc/s6/syslogd/run | 0 docker/{ => root}/etc/s6/syslogd/setup | 0 docker/{ => root}/etc/ssh/sshd_config | 0 docker/{ => root}/etc/templates/app.ini | 0 docker/{ => root}/usr/bin/entrypoint | 0 17 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .dockerignore 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/s6/syslogd/finish (100%) rename docker/{ => root}/etc/s6/syslogd/run (100%) rename docker/{ => root}/etc/s6/syslogd/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/.dockerignore b/.dockerignore deleted file mode 100644 index 1cf4c6dbc8e5..000000000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -/docker/Makefile diff --git a/Dockerfile b/Dockerfile index e1d2ea8412a8..1aae5fc6d424 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/s6/syslogd/finish b/docker/root/etc/s6/syslogd/finish similarity index 100% rename from docker/etc/s6/syslogd/finish rename to docker/root/etc/s6/syslogd/finish diff --git a/docker/etc/s6/syslogd/run b/docker/root/etc/s6/syslogd/run similarity index 100% rename from docker/etc/s6/syslogd/run rename to docker/root/etc/s6/syslogd/run diff --git a/docker/etc/s6/syslogd/setup b/docker/root/etc/s6/syslogd/setup similarity index 100% rename from docker/etc/s6/syslogd/setup rename to docker/root/etc/s6/syslogd/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 From 3ed7d97a8e748d368b7b277dc4d55f861a7610cc Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Sat, 13 Apr 2019 19:15:41 +0200 Subject: [PATCH 3/3] [misc] revert change in Makefile ref 32b3253edb617bbaeadc5e16fb83b0ddaae634ee Signed-off-by: Jakob Ackermann --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9f47f68e8261..b8d156b76c7a 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ strip-suffix = $(firstword $(subst ., ,$(1))) .PHONY: all all: build --include docker/Makefile +include docker/Makefile .PHONY: clean clean: