Rebase to 3.17

linuxserver · Aug 6, 2023 · 7d1bbf3 · 7d1bbf3
1 parent 74ae42b
commit 7d1bbf3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -16,12 +16,12 @@ RUN \
     yarn && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php82-gd \
-    php82-intl \
-    php82-ldap \
-    php82-pdo \
-    php82-pdo_sqlite \
-    php82-tokenizer && \
+    php81-gd \
+    php81-intl \
+    php81-ldap \
+    php81-pdo \
+    php81-pdo_sqlite \
+    php81-tokenizer && \
   echo "**** install grocy ****" && \
   mkdir -p /app/www && \
   if [ -z ${GROCY_RELEASE+x} ]; then \

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -16,12 +16,12 @@ RUN \
     yarn && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php82-gd \
-    php82-intl \
-    php82-ldap \
-    php82-pdo \
-    php82-pdo_sqlite \
-    php82-tokenizer && \
+    php81-gd \
+    php81-intl \
+    php81-ldap \
+    php81-pdo \
+    php81-pdo_sqlite \
+    php81-tokenizer && \
   echo "**** install grocy ****" && \
   mkdir -p /app/www && \
   if [ -z ${GROCY_RELEASE+x} ]; then \

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -38,6 +38,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "06.08.23:", desc: "Rebase to Alpine 3.17 for PHP 8.1." }
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
   - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }