From 2b6f47454187d728d3aeff8d8528072bab008a77 Mon Sep 17 00:00:00 2001
From: Jean-Christian Denis <contact@jcdenis.fr>
Date: Fri, 13 Dec 2024 00:44:41 +0100
Subject: [PATCH] cleanup ownership

---
 Dockerfile           | 20 +++++++++-----------
 docker-entrypoint.sh |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1c1a078..4453611 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,9 @@ RUN echo "UTC" > /etc/timezone
 ARG CANAL stable
 ENV CNL_DOTCLEAR=$CANAL
 
+# Create user
+RUN adduser -D -g 'www' www
+
 # Image label
 LABEL org.opencontainers.image.source=https://github.com/JcDenis/docker-dotclear
 LABEL org.opencontainers.image.description="Dotclear docker image $CNL_DOTCLEAR"
@@ -24,9 +27,6 @@ LABEL org.opencontainers.image.licenses=AGPL-3.0
 # Nginx
 ##
 
-# Create user
-RUN adduser -D -g 'www' www
-
 # Install required package
 RUN apk add --no-cache --update \
     nginx \
@@ -45,6 +45,9 @@ COPY etc/snippets_subfolder.conf /etc/nginx/snippets/snippets_subfolder.conf
 COPY etc/snippets_subdomain.conf /etc/nginx/snippets/snippets_subdomain.conf
 COPY etc/snippets_common.conf /etc/nginx/snippets/snippets_common.conf
 
+# Fix vuln alpine/curl 8.11.0-r2
+RUN apk upgrade curl
+
 ##
 # PHP
 ##
@@ -96,14 +99,10 @@ RUN curl -fsSL -o versions.xml "http://download.dotclear.org/versions.xml" \
     && echo "$(cat versions.xml | xq -x "//release[@name='$CNL_DOTCLEAR']/@checksum") dotclear.zip" | md5sum -c - \
     && mkdir -p /usr/src/dotclear \
     && unzip -d /usr/src dotclear.zip \
-    && rm dotclear.zip \
-    && chown -R www:www /usr/src/dotclear \
-    && chmod -R 755 /usr/src/dotclear/public /usr/src/dotclear/cache \
-    && rm -f /var/www/dotclear/app/*
+    && rm dotclear.zip
 
 # Create www structure
 COPY www /var/lib/dotclear
-RUN chown -R www:www /var/lib/dotclear
 
 # These variables are only used for first install, see inc/config.php, from dotclear 2.32
 # Custom path for dotclear config file
@@ -124,7 +123,6 @@ ENV VER_DW=0.9.3
 RUN curl -fsSL -o plugin.zip "https://github.com/JcDenis/DotclearWatch/releases/download/v$VER_DW/plugin-DotclearWatch.zip" \
     && mkdir -p /var/lib/dotclear/plugins/DotclearWatch \
     && unzip -d /var/lib/dotclear/plugins plugin.zip \
-    && chown -R www:www /var/lib/dotclear/plugins \
     && rm plugin.zip
 
 # dcLog
@@ -132,7 +130,6 @@ ENV VER_DL=1.7.3
 RUN curl -fsSL -o plugin.zip "https://github.com/JcDenis/dcLog/releases/download/v$VER_DL/plugin-dcLog.zip" \
     && mkdir -p /var/lib/dotclear/plugins/dcLog \
     && unzip -d /var/lib/dotclear/plugins plugin.zip \
-    && chown -R www:www /var/lib/dotclear/plugins \
     && rm plugin.zip
 
 # sysInfo
@@ -140,9 +137,10 @@ ENV VER_SI=9.8
 RUN curl -fsSL -o plugin.zip "https://github.com/franck-paul/sysInfo/releases/download/$VER_SI/plugin-sysInfo-$VER_SI.zip" \
     && mkdir -p /var/lib/dotclear/plugins/sysInfo \
     && unzip -d /var/lib/dotclear/plugins plugin.zip \
-    && chown -R www:www /var/lib/dotclear/plugins \
     && rm plugin.zip
 
+# Fix ownership
+RUN chown -R www:www /var/lib/dotclear /usr/src/dotclear
 
 ##
 # END
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 36d7856..bc4d199 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -83,7 +83,7 @@ rm -f /var/www/dotclear/servers/default.conf
 echo >&2 "Setting up permissions..."
 chown -R www:www /var/www/dotclear
 [ -e /var/www/dotclear/config.php ] && chmod 600 /var/www/dotclear/config.php
-chmod 600 /var/www/dotclear/servers
+chmod 600 -R /var/www/dotclear/servers
 
 # Print summary to docker logs
 VERSION_INSTALLED=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" release.json)