From 51a95afdbbd43c69097c0452bacb049991a10ff9 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 28 Oct 2023 13:40:22 +0200
Subject: Prepare Alpine OIDC (#5764)

* Prepare Alpine OIDC
* Prepare syntax for OpenID Connect in Alpine.
* Update :newest Alpine development image to PHP 8.3
* Fix a little bug in test of OIDC_SCOPES

* Changelog + syntax

* shellchecks
---
 Docker/Dockerfile-Newest | 13 +++++++------
 Docker/entrypoint.sh     |  9 ++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'Docker')

diff --git a/Docker/Dockerfile-Newest b/Docker/Dockerfile-Newest
index c5615b512..159f244f6 100644
--- a/Docker/Dockerfile-Newest
+++ b/Docker/Dockerfile-Newest
@@ -5,11 +5,11 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \
 	apk add --no-cache \
 	tzdata \
-	apache2 php82-apache2 \
+	apache2 php83-apache2 \
 	apache-mod-auth-openidc \
-	php82 php82-curl php82-gmp php82-intl php82-mbstring php82-xml php82-zip \
-	php82-ctype php82-dom php82-fileinfo php82-iconv php82-json php82-opcache php82-openssl php82-phar php82-session php82-simplexml php82-xmlreader php82-xmlwriter php82-xml php82-tokenizer php82-zlib \
-	php82-pdo_sqlite php82-pdo_mysql php82-pdo_pgsql
+	php83 php83-curl php83-gmp php83-intl php83-mbstring php83-xml php83-zip \
+	php83-ctype php83-dom php83-fileinfo php83-iconv php83-json php83-opcache php83-openssl php83-phar php83-session php83-simplexml php83-xmlreader php83-xmlwriter php83-xml php83-tokenizer php83-zlib \
+	php83-pdo_sqlite php83-pdo_mysql php83-pdo_pgsql
 
 RUN mkdir -p /var/www/FreshRSS /run/apache2/
 WORKDIR /var/www/FreshRSS
@@ -41,8 +41,9 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \
 		/etc/apache2/httpd.conf && \
 	sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \
 		/etc/apache2/httpd.conf && \
-	if [ ! -f /usr/bin/php ]; then ln -s /usr/bin/php82 /usr/bin/php; else true; fi && \
-	echo 'memory_limit = 256M' > /etc/php82/conf.d/10_memory.ini && \
+	mv /etc/apache2/conf.d/mod-auth-openidc.conf /etc/apache2/conf.d/mod-auth-openidc.conf.bak && \
+	if [ ! -f /usr/bin/php ]; then ln -s /usr/bin/php83 /usr/bin/php; else true; fi && \
+	echo 'memory_limit = 256M' > /etc/php83/conf.d/10_memory.ini && \
 	# Disable built-in updates when using Docker, as the full image is supposed to be updated instead.
 	sed -r -i "\\#disable_update#s#^.*#\t'disable_update' => true,#" ./config.default.php && \
 	touch /var/www/FreshRSS/Docker/env.txt && \
diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh
index 920fb2200..82cc4f9a8 100755
--- a/Docker/entrypoint.sh
+++ b/Docker/entrypoint.sh
@@ -22,9 +22,12 @@ if [ -n "$TRUSTED_PROXY" ]; then
 fi
 
 if [ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ]; then
-	a2enmod -q auth_openidc
-	if [ -n "$OIDC_ENABLED" ]; then
-		# Compatibility with : as separator instead of space:
+	# Debian
+	(which a2enmod >/dev/null && a2enmod -q auth_openidc) ||
+		# Alpine
+		(mv /etc/apache2/conf.d/mod-auth-openidc.conf.bak /etc/apache2/conf.d/mod-auth-openidc.conf && echo 'Enabling module auth_openidc.')
+	if [ -n "$OIDC_SCOPES" ]; then
+		# Compatibility with : as separator instead of space
 		OIDC_SCOPES=$(echo "$OIDC_SCOPES" | tr ':' ' ')
 		export OIDC_SCOPES
 	fi
-- 
cgit v1.2.3