From 9129b2d82053943cc5a5e362ebd9be929b9149a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20MICAUX?= <fmicaux_at_actilis_._net>
Date: Sat, 25 May 2019 11:47:14 +0200
Subject: [PATCH] Setup www-data user & group from Dockerfile instead of
entry-point to be known when building from this image
---
centos/Dockerfile | 7 ++++++-
centos/files/ep.sh | 8 ++++----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/centos/Dockerfile b/centos/Dockerfile
index 3c88dd6..3d5e515 100644
--- a/centos/Dockerfile
+++ b/centos/Dockerfile
@@ -13,6 +13,11 @@ LABEL Vendor="Actilis" \
ENV WEB_USERNAME www-data
ENV WEB_GROUPNAME www-data
+# Ensure Username and Groupname (see Dockerfile) are present
+RUN set -eux \
+ && groupadd -g ${WEB_GID:=1000} -r ${WEB_GROUPNAME} \
+ && useradd -u ${WEB_UID:=1000} -g ${WEB_GROUPNAME} ${WEB_USERNAME}
+
# ===============================================
# Layer de base
# à reprendre par toutes les images pour mutualisation
@@ -71,7 +76,7 @@ RUN chmod -R 500 /ep.sh /ep.d/
RUN set -eux \
&& rm -f /etc/httpd/conf.d/welcome.conf \
&& chmod o+x /var /var/www \
- && chown -R apache.apache /var/www/html \
+ && chown -R ${WEB_USERNAME}.${WEB_GROUPNAME} /var/www/html \
&& chmod -R 755 /var/www/html
## Ports
diff --git a/centos/files/ep.sh b/centos/files/ep.sh
index f5f40df..8e7e9fd 100755
--- a/centos/files/ep.sh
+++ b/centos/files/ep.sh
@@ -10,12 +10,12 @@ export TZ=${TIMEZONE:-Europe/Paris}
ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Ensure Username and Groupname (see Dockerfile) are present
-WEB_USERNAME=${WEB_USERNAME:-www-data}
-groupadd -g ${WEB_GID:=1000} -r ${WEB_GROUPNAME:=www-data}
-useradd -u ${WEB_UID:=1000} -g ${WEB_GROUPNAME} ${WEB_USERNAME}
+# WEB_USERNAME=${WEB_USERNAME:-www-data}
+# groupadd -g ${WEB_GID:=1000} -r ${WEB_GROUPNAME:=www-data}
+# useradd -u ${WEB_UID:=1000} -g ${WEB_GROUPNAME} ${WEB_USERNAME}
# Export Vars for ep-*.sh
-export WEB_USERNAME WEB_GROUPNAME
+# export WEB_USERNAME WEB_GROUPNAME
# Tuning ldap.conf
sed -i -e "\$a\
--
GitLab