dw/docker-dotclear
1
0
Fork 0
Code Issues Pull requests Packages Wiki Activity

cleanup ownership

Browse source
This commit is contained in:
Jean-Christian Denis 2024-12-13 00:44:41 +01:00
parent ee0d865d14
commit 2b6f474541
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Dockerfile
View file

@ -15,6 +15,9 @@ RUN echo "UTC" > /etc/timezone
ARG CANAL stable ARG CANAL stable
ENV CNL_DOTCLEAR=$CANAL ENV CNL_DOTCLEAR=$CANAL
# Create user
RUN adduser -D -g 'www' www
# Image label # Image label
LABEL org.opencontainers.image.source=https://github.com/JcDenis/docker-dotclear LABEL org.opencontainers.image.source=https://github.com/JcDenis/docker-dotclear
LABEL org.opencontainers.image.description="Dotclear docker image $CNL_DOTCLEAR" LABEL org.opencontainers.image.description="Dotclear docker image $CNL_DOTCLEAR"
@ -24,9 +27,6 @@ LABEL org.opencontainers.image.licenses=AGPL-3.0
# Nginx # Nginx
## ##
# Create user
RUN adduser -D -g 'www' www
# Install required package # Install required package
RUN apk add --no-cache --update \ RUN apk add --no-cache --update \
nginx \ 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_subdomain.conf /etc/nginx/snippets/snippets_subdomain.conf
COPY etc/snippets_common.conf /etc/nginx/snippets/snippets_common.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 # 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 - \ && echo "$(cat versions.xml | xq -x "//release[@name='$CNL_DOTCLEAR']/@checksum") dotclear.zip" | md5sum -c - \
&& mkdir -p /usr/src/dotclear \ && mkdir -p /usr/src/dotclear \
&& unzip -d /usr/src dotclear.zip \ && unzip -d /usr/src dotclear.zip \
&& rm 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/*
# Create www structure # Create www structure
COPY www /var/lib/dotclear 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 # These variables are only used for first install, see inc/config.php, from dotclear 2.32
# Custom path for dotclear config file # 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" \ 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 \ && mkdir -p /var/lib/dotclear/plugins/DotclearWatch \
&& unzip -d /var/lib/dotclear/plugins plugin.zip \ && unzip -d /var/lib/dotclear/plugins plugin.zip \
&& chown -R www:www /var/lib/dotclear/plugins \
&& rm plugin.zip && rm plugin.zip
# dcLog # 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" \ 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 \ && mkdir -p /var/lib/dotclear/plugins/dcLog \
&& unzip -d /var/lib/dotclear/plugins plugin.zip \ && unzip -d /var/lib/dotclear/plugins plugin.zip \
&& chown -R www:www /var/lib/dotclear/plugins \
&& rm plugin.zip && rm plugin.zip
# sysInfo # 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" \ 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 \ && mkdir -p /var/lib/dotclear/plugins/sysInfo \
&& unzip -d /var/lib/dotclear/plugins plugin.zip \ && unzip -d /var/lib/dotclear/plugins plugin.zip \
&& chown -R www:www /var/lib/dotclear/plugins \
&& rm plugin.zip && rm plugin.zip
# Fix ownership
RUN chown -R www:www /var/lib/dotclear /usr/src/dotclear
## ##
# END # END

2
docker-entrypoint.sh
View file

@ -83,7 +83,7 @@ rm -f /var/www/dotclear/servers/default.conf
echo >&2 "Setting up permissions..." echo >&2 "Setting up permissions..."
chown -R www:www /var/www/dotclear chown -R www:www /var/www/dotclear
[ -e /var/www/dotclear/config.php ] && chmod 600 /var/www/dotclear/config.php [ -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 # Print summary to docker logs
VERSION_INSTALLED=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" release.json) VERSION_INSTALLED=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" release.json)