From c831ba5ca45f3618e9b3332bbbd7fd0333441831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Wed, 25 Apr 2018 11:18:49 +0200 Subject: [PATCH] Fix permissions on Python libraries besides TFW --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf6e494..63c8cab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,8 @@ RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - libzmq5 \ nginx \ gettext-base &&\ - rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* &&\ + ln -sf /bin/bash /bin/sh COPY requirements.txt /tmp RUN pip3 install -r /tmp/requirements.txt @@ -26,7 +27,7 @@ ENV TFW_PUBLIC_PORT=8888 \ EXPOSE ${TFW_PUBLIC_PORT} -ENV PYTHONPATH="/usr/local/lib/" \ +ENV PYTHONPATH="/usr/local/lib" \ TFW_SUPERVISOR_HTTP_URI="http://localhost:${TFW_SUPERVISOR_HTTP_PORT}" \ TFW_SUPERVISORD_CONF="/etc/supervisor/supervisord.conf" \ TFW_SUPERVISORD_COMPONENTS="/etc/supervisor/conf" \ @@ -49,8 +50,8 @@ COPY nginx/default.conf ${TFW_NGINX_DEFAULT} COPY nginx/components/ ${TFW_NGINX_COMPONENTS} COPY lib LICENSE ${TFW_LIB_DIR} -RUN for dir in "${TFW_LIB_DIR}" "/etc/nginx" "/etc/supervisor"; do \ - chown -R root:root "$dir" && chmod -R 700 "$dir"; \ +RUN for dir in "${TFW_LIB_DIR}"/{tfw,tao,envvars.py} "/etc/nginx" "/etc/supervisor"; do \ + chown -R root:root "$dir" && chmod -R 700 "$dir"; \ done ONBUILD ARG BUILD_CONTEXT="solvable"