From f591d1c9ad3df2e3468ace70bcbd6413f42c6c80 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 15:29:03 -0400 Subject: [PATCH 01/14] Mods for K8 deployment. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81048ff..0ea067a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,5 +68,5 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ #COPY apache2-iipsrv-fcgid.conf /root/src/iip-openslide-docker/apache2-iipsrv-fcgid.conf -#CMD service apache2 start && while true; do sleep 1000; done -CMD apachectl -D FOREGROUND +CMD service apache2 start && while true; do sleep 1000; done +# CMD apachectl -D FOREGROUND From 203ab26c24f9119718055126ab13e2cce04de62e Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 15:49:38 -0400 Subject: [PATCH 02/14] Port changes. --- ports.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports.conf b/ports.conf index a733681..717609d 100644 --- a/ports.conf +++ b/ports.conf @@ -1,9 +1,9 @@ -Listen 80 +Listen 8000 - Listen 443 + Listen 443i0 - Listen 443 + Listen 4430 From c545a8a964dacc6e44c8894e5a8793bd28c7b056 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 15:56:51 -0400 Subject: [PATCH 03/14] Port changes. --- ports.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports.conf b/ports.conf index 717609d..4e664ef 100644 --- a/ports.conf +++ b/ports.conf @@ -1,7 +1,7 @@ Listen 8000 - Listen 443i0 + Listen 4430 From 9f463d4126a578374fc48b6e1af35767c8274832 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 17:31:09 -0400 Subject: [PATCH 04/14] Added USER --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 0ea067a..eff01ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,6 +67,7 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ #COPY apache2-iipsrv-fcgid.conf /root/src/iip-openslide-docker/apache2-iipsrv-fcgid.conf +USER 0:0 CMD service apache2 start && while true; do sleep 1000; done # CMD apachectl -D FOREGROUND From bdb4460fca4a073fdba2e42eecb7f190ae0a5ba0 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 17:43:20 -0400 Subject: [PATCH 05/14] chmod for standard user access. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eff01ca..dea29b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,6 @@ RUN ln -s /etc/apache2/mods-available/proxy.conf /etc/apache2/mods-enabled/proxy COPY apache2.conf /etc/apache2/apache2.conf COPY ports.conf /etc/apache2/ports.conf - WORKDIR /root/src ### openjpeg version in ubuntu 14.04 is 1.3, too old and does not have openslide required chroma subsampled images support. download 2.1.0 from source and build @@ -67,7 +66,8 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ #COPY apache2-iipsrv-fcgid.conf /root/src/iip-openslide-docker/apache2-iipsrv-fcgid.conf -USER 0:0 +RUN chgrp -R 0 /var/log/apache2 && \ + chmod -R g+rwX /var/log/apache2 CMD service apache2 start && while true; do sleep 1000; done # CMD apachectl -D FOREGROUND From 238edb3f05eeef99cbf72d942bff1a95f54b598e Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 17:48:50 -0400 Subject: [PATCH 06/14] chmod all folders. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index dea29b2..b38744d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,8 +66,8 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ #COPY apache2-iipsrv-fcgid.conf /root/src/iip-openslide-docker/apache2-iipsrv-fcgid.conf -RUN chgrp -R 0 /var/log/apache2 && \ - chmod -R g+rwX /var/log/apache2 +RUN chgrp -R 0 / && \ + chmod -R g+rwX / CMD service apache2 start && while true; do sleep 1000; done # CMD apachectl -D FOREGROUND From a140fccc1fdd354489c4cf00b127ce9a6e04b896 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 17:56:24 -0400 Subject: [PATCH 07/14] chmod to /var/log --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b38744d..80c0a4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,8 +66,8 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ #COPY apache2-iipsrv-fcgid.conf /root/src/iip-openslide-docker/apache2-iipsrv-fcgid.conf -RUN chgrp -R 0 / && \ - chmod -R g+rwX / +RUN chgrp -R 0 /var/log && \ + chmod -R g+rwX /var/log CMD service apache2 start && while true; do sleep 1000; done # CMD apachectl -D FOREGROUND From 5180b0e62b50477654d5cb17181bee792d43659d Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 18:01:38 -0400 Subject: [PATCH 08/14] chmod to /var --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 80c0a4f..7f8d809 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,8 +66,8 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ #COPY apache2-iipsrv-fcgid.conf /root/src/iip-openslide-docker/apache2-iipsrv-fcgid.conf -RUN chgrp -R 0 /var/log && \ - chmod -R g+rwX /var/log +RUN chgrp -R 0 /var && \ + chmod -R g+rwX /var CMD service apache2 start && while true; do sleep 1000; done # CMD apachectl -D FOREGROUND From c9b79d0b4fab13a02a1a95af9fde45d3398c4ac0 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 18:13:08 -0400 Subject: [PATCH 09/14] environment. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7f8d809..595707c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,5 +69,7 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ RUN chgrp -R 0 /var && \ chmod -R g+rwX /var +RUN export APACHE_LOCK_DIR=/var/log + CMD service apache2 start && while true; do sleep 1000; done # CMD apachectl -D FOREGROUND From f836b4e679d392838c7c18ff798f16e9abd3dc3c Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Sun, 23 Aug 2020 18:17:24 -0400 Subject: [PATCH 10/14] . --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 595707c..c950393 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,7 +69,7 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ RUN chgrp -R 0 /var && \ chmod -R g+rwX /var -RUN export APACHE_LOCK_DIR=/var/log +ENV APACHE_LOCK_DIR=/var/log CMD service apache2 start && while true; do sleep 1000; done # CMD apachectl -D FOREGROUND From fe9c786d49f8ed7d0e8a77cb3d1eb8a13f422577 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Mon, 24 Aug 2020 08:34:40 -0400 Subject: [PATCH 11/14] . --- Dockerfile | 12 +++++++----- apache2.conf | 2 +- ports.conf | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c950393..977f8ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -66,10 +66,12 @@ RUN cp /root/src/iipsrv/src/iipsrv.fcgi /var/www/localhost/fcgi-bin/ #COPY apache2-iipsrv-fcgid.conf /root/src/iip-openslide-docker/apache2-iipsrv-fcgid.conf +RUN chgrp -R 0 /root && \ + chmod -R g+rwX /root RUN chgrp -R 0 /var && \ - chmod -R g+rwX /var + chmod -R g+rwX /var +RUN chgrp -R 0 /run && \ + chmod -R g+rwX /run -ENV APACHE_LOCK_DIR=/var/log - -CMD service apache2 start && while true; do sleep 1000; done -# CMD apachectl -D FOREGROUND +# CMD service apache2 start && while true; do sleep 1000; done +CMD apachectl -D FOREGROUND diff --git a/apache2.conf b/apache2.conf index 9f327a7..e08e127 100644 --- a/apache2.conf +++ b/apache2.conf @@ -72,7 +72,7 @@ ServerName localhost # # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. # -Mutex file:${APACHE_LOCK_DIR} default +Mutex file:/var/log default # # PidFile: The file in which the server should record its process diff --git a/ports.conf b/ports.conf index 4e664ef..679cb56 100644 --- a/ports.conf +++ b/ports.conf @@ -1,4 +1,4 @@ -Listen 8000 +Listen 8080 Listen 4430 From f938f6e26dafcbc31227b5634ce94e5fdef26e18 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Tue, 25 Aug 2020 07:46:14 -0400 Subject: [PATCH 12/14] Changed ports to 8080 and 8443. --- ports.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports.conf b/ports.conf index 679cb56..ec84a57 100644 --- a/ports.conf +++ b/ports.conf @@ -1,9 +1,9 @@ Listen 8080 - Listen 4430 + Listen 8443 - Listen 4430 + Listen 8443 From b49b27b8eff30c2eb9e0656257c32c4ebb709925 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Wed, 26 Aug 2020 09:42:27 -0400 Subject: [PATCH 13/14] Added USER 1001 for non-root user runs. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 977f8ba..2dff812 100644 --- a/Dockerfile +++ b/Dockerfile @@ -73,5 +73,7 @@ RUN chgrp -R 0 /var && \ RUN chgrp -R 0 /run && \ chmod -R g+rwX /run +USER 1001 + # CMD service apache2 start && while true; do sleep 1000; done CMD apachectl -D FOREGROUND From 3dc5764a67bd23855b83a24c084f7f74da04b909 Mon Sep 17 00:00:00 2001 From: Tahsin Kurc Date: Wed, 26 Aug 2020 15:42:39 -0400 Subject: [PATCH 14/14] Set folder permissions for non-root user. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2dff812..21cbc46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,6 +72,8 @@ RUN chgrp -R 0 /var && \ chmod -R g+rwX /var RUN chgrp -R 0 /run && \ chmod -R g+rwX /run +RUN chgrp -R 0 /etc/apache2 && \ + chmod -R g+rwX /etc/apache2 USER 1001