From bc92f655d86cce0d8151c6b83358f135f4089901 Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Wed, 20 Sep 2023 23:33:43 +0200
Subject: [PATCH 1/2] dockerfile: update base alpine image to v3.18 - fixes
 security issues reported by trivy

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ed05e1712..884632720 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN cd shaarli \
 
 # Stage 4:
 # - Shaarli image
-FROM alpine:3.16
+FROM alpine:3.18
 LABEL maintainer="Shaarli Community"
 
 RUN apk --update --no-cache add \

From fd22b31d112c107cb946a9a5d9396c343765b89d Mon Sep 17 00:00:00 2001
From: nodiscc <nodiscc@gmail.com>
Date: Wed, 20 Sep 2023 23:53:54 +0200
Subject: [PATCH 2/2] dockerfile: alpine php8 packages are now prefixed with
 php82 - php8.0 was deprecated in alpine 3.17

---
 Dockerfile | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 884632720..6660c8f0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,22 +32,22 @@ LABEL maintainer="Shaarli Community"
 RUN apk --update --no-cache add \
         ca-certificates \
         nginx \
-        php8 \
-        php8-ctype \
-        php8-curl \
-        php8-fpm \
-        php8-gd \
-        php8-gettext \
-        php8-iconv \
-        php8-intl \
-        php8-json \
-        php8-ldap \
-        php8-mbstring \
-        php8-openssl \
-        php8-session \
-        php8-xml \
-        php8-simplexml \
-        php8-zlib \
+        php82 \
+        php82-ctype \
+        php82-curl \
+        php82-fpm \
+        php82-gd \
+        php82-gettext \
+        php82-iconv \
+        php82-intl \
+        php82-json \
+        php82-ldap \
+        php82-mbstring \
+        php82-openssl \
+        php82-session \
+        php82-xml \
+        php82-simplexml \
+        php82-zlib \
         s6
 
 COPY .docker/nginx.conf /etc/nginx/nginx.conf