Rebase to Alpine 3.19

Signed-off-by: Eric Nemchik <[email protected]>
linuxserver · Dec 24, 2023 · 9a735fb · 9a735fb
1 parent 26f509a
commit 9a735fb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 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.19
 
 # 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 && \
+    php83-gd \
+    php83-intl \
+    php83-ldap \
+    php83-pdo \
+    php83-pdo_sqlite \
+    php83-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.19
 
 # 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 && \
+    php83-gd \
+    php83-intl \
+    php83-ldap \
+    php83-pdo \
+    php83-pdo_sqlite \
+    php83-tokenizer && \
   echo "**** install grocy ****" && \
   mkdir -p /app/www && \
   if [ -z ${GROCY_RELEASE+x} ]; then \

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -21,7 +21,7 @@ available_architectures:
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "this will store any uploaded data on the docker host" }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
 param_usage_include_env: true
 param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "for specifying your timezone" }
@@ -41,6 +41,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
   - { 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." }

diff --git a/root/etc/php81/conf.d/grocy-local.ini → root/etc/php83/conf.d/grocy.ini b/root/etc/php81/conf.d/grocy-local.ini → root/etc/php83/conf.d/grocy.ini