From 7d9078fcfcf77ab0d8461206875c0f063c44d36c Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Sat, 6 Oct 2018 19:47:46 +0200 Subject: [PATCH 1/2] Adding an entry_point.sh, fixes #801, fixes #800 and fixes 797 --- Base/Dockerfile | 4 ++-- Base/entry_point.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100755 Base/entry_point.sh diff --git a/Base/Dockerfile b/Base/Dockerfile index f966bba241..dc2d40c7bd 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -58,7 +58,7 @@ RUN mkdir -p /opt/bin #====================================== # Add Grid check script #====================================== -COPY check-grid.sh /opt/bin/ +COPY check-grid.sh entry_point.sh /opt/bin/ RUN chmod +x /opt/bin/check-grid.sh #====================================== @@ -86,4 +86,4 @@ RUN sudo mkdir -p /opt/selenium \ && sudo chown -R seluser:seluser /var/log/supervisor -CMD ["/usr/bin/supervisord", "--configuration", "/etc/supervisord.conf"] +CMD ["/opt/bin/entry_point.sh"] diff --git a/Base/entry_point.sh b/Base/entry_point.sh new file mode 100755 index 0000000000..405b290d4e --- /dev/null +++ b/Base/entry_point.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +/usr/bin/supervisord --configuration /etc/supervisord.conf From 4a8d433c42c9c7cfb95f5d30ad513d90ae520f5a Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Sat, 6 Oct 2018 20:27:24 +0200 Subject: [PATCH 2/2] Using same commands from #787 (Support Arbitrary User IDs for OpenShift) for new directories used by Supervisor. Fixes #802 --- Base/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Base/Dockerfile b/Base/Dockerfile index dc2d40c7bd..50806f384c 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -83,7 +83,9 @@ RUN sudo mkdir -p /opt/selenium \ && sudo mkdir -p /var/run/supervisor/ \ && sudo mkdir -p /var/log/supervisor/ \ && sudo chown -R seluser:seluser /var/run/supervisor \ - && sudo chown -R seluser:seluser /var/log/supervisor + && sudo chown -R seluser:seluser /var/log/supervisor \ + && sudo chgrp -R 0 /var/run/supervisor /var/log/supervisor \ + && sudo chmod -R g=u /var/run/supervisor /var/log/supervisor CMD ["/opt/bin/entry_point.sh"]