Update to 4.1.1 and 5.0.0-beta.4 (#145)

monicahq · May 3, 2024 · 4ad2835 · 4ad2835
1 parent d50bf7c
commit 4ad2835
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 42 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
 
 
 env:
-  bashbrew-version: 0.1.9
+  bashbrew-version: 0.1.12
 
 jobs:
   build:
@@ -24,9 +24,9 @@ jobs:
         release: [4, 5]
         include:
           - release: 4
-            php-version: 8.1
-          - release: 5
             php-version: 8.2
+          - release: 5
+            php-version: 8.3
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 env:
-  bashbrew-version: 0.1.9
+  bashbrew-version: 0.1.12
 
 
 jobs:

diff --git a/.templates/scripts/5/entrypoint.sh b/.templates/scripts/5/entrypoint.sh
@@ -59,7 +59,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     fi
 
     # Run migrations
-    ${ARTISAN} monica:waitfordb
+    ${ARTISAN} waitfordb
     ${ARTISAN} monica:setup --force -vv
 
 fi

diff --git a/4/apache/Dockerfile b/4/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-apache
+FROM php:8.2-apache
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -58,7 +58,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.22; \
+    pecl install APCu-5.1.23; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
     \
@@ -148,9 +148,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v4.0.0
-LABEL org.opencontainers.image.revision="e1a3e1315b1a92a5ff0ccab6c22ba9ded77a599e" \
-      org.opencontainers.image.version="v4.0.0"
+ENV MONICA_VERSION v4.1.1
+LABEL org.opencontainers.image.revision="50c266f7beb9d8fe6cd8c8929a759529275143f4" \
+      org.opencontainers.image.version="v4.1.1"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/4/fpm-alpine/Dockerfile b/4/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-fpm-alpine
+FROM php:8.2-fpm-alpine
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -49,7 +49,7 @@ RUN set -ex; \
         soap \
     ; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.22; \
+    pecl install APCu-5.1.23; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
     \
@@ -111,9 +111,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v4.0.0
-LABEL org.opencontainers.image.revision="e1a3e1315b1a92a5ff0ccab6c22ba9ded77a599e" \
-      org.opencontainers.image.version="v4.0.0"
+ENV MONICA_VERSION v4.1.1
+LABEL org.opencontainers.image.revision="50c266f7beb9d8fe6cd8c8929a759529275143f4" \
+      org.opencontainers.image.version="v4.1.1"
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \

diff --git a/4/fpm/Dockerfile b/4/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-fpm
+FROM php:8.2-fpm
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -58,7 +58,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.22; \
+    pecl install APCu-5.1.23; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
     \
@@ -125,9 +125,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v4.0.0
-LABEL org.opencontainers.image.revision="e1a3e1315b1a92a5ff0ccab6c22ba9ded77a599e" \
-      org.opencontainers.image.version="v4.0.0"
+ENV MONICA_VERSION v4.1.1
+LABEL org.opencontainers.image.revision="50c266f7beb9d8fe6cd8c8929a759529275143f4" \
+      org.opencontainers.image.version="v4.1.1"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/5/apache/Dockerfile b/5/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-apache
+FROM php:8.3-apache
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -58,7 +58,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.22; \
+    pecl install APCu-5.1.23; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
     \
@@ -148,9 +148,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v5.0.0-beta.3
-LABEL org.opencontainers.image.revision="452f59f58cb65097968eb9a6153d7be191fce08d" \
-      org.opencontainers.image.version="v5.0.0-beta.3"
+ENV MONICA_VERSION v5.0.0-beta.4
+LABEL org.opencontainers.image.revision="a657ff47feb137450b1ffb6eaf1d98c3e777e57e" \
+      org.opencontainers.image.version="v5.0.0-beta.4"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/5/apache/entrypoint.sh b/5/apache/entrypoint.sh
@@ -59,7 +59,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     fi
 
     # Run migrations
-    ${ARTISAN} monica:waitfordb
+    ${ARTISAN} waitfordb
     ${ARTISAN} monica:setup --force -vv
 
 fi

diff --git a/5/fpm-alpine/Dockerfile b/5/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-fpm-alpine
+FROM php:8.3-fpm-alpine
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -49,7 +49,7 @@ RUN set -ex; \
         soap \
     ; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.22; \
+    pecl install APCu-5.1.23; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
     \
@@ -111,9 +111,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v5.0.0-beta.3
-LABEL org.opencontainers.image.revision="452f59f58cb65097968eb9a6153d7be191fce08d" \
-      org.opencontainers.image.version="v5.0.0-beta.3"
+ENV MONICA_VERSION v5.0.0-beta.4
+LABEL org.opencontainers.image.revision="a657ff47feb137450b1ffb6eaf1d98c3e777e57e" \
+      org.opencontainers.image.version="v5.0.0-beta.4"
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \

diff --git a/5/fpm-alpine/entrypoint.sh b/5/fpm-alpine/entrypoint.sh
@@ -59,7 +59,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     fi
 
     # Run migrations
-    ${ARTISAN} monica:waitfordb
+    ${ARTISAN} waitfordb
     ${ARTISAN} monica:setup --force -vv
 
 fi

diff --git a/5/fpm/Dockerfile b/5/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2-fpm
+FROM php:8.3-fpm
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -58,7 +58,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.22; \
+    pecl install APCu-5.1.23; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
     \
@@ -125,9 +125,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v5.0.0-beta.3
-LABEL org.opencontainers.image.revision="452f59f58cb65097968eb9a6153d7be191fce08d" \
-      org.opencontainers.image.version="v5.0.0-beta.3"
+ENV MONICA_VERSION v5.0.0-beta.4
+LABEL org.opencontainers.image.revision="a657ff47feb137450b1ffb6eaf1d98c3e777e57e" \
+      org.opencontainers.image.version="v5.0.0-beta.4"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/5/fpm/entrypoint.sh b/5/fpm/entrypoint.sh
@@ -59,7 +59,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     fi
 
     # Run migrations
-    ${ARTISAN} monica:waitfordb
+    ${ARTISAN} waitfordb
     ${ARTISAN} monica:setup --force -vv
 
 fi

diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -62,7 +62,7 @@ latest="$(curl -fsSL 'https://api.github.com/repos/monicahq/monica/releases/late
 
 # releases=( */ )
 # releases=( "${releases[@]%/}" )
-releases=( 4 )
+releases=( 4 5 )
 
 for release in "${releases[@]}"; do
 

diff --git a/update.sh b/update.sh
@@ -20,9 +20,9 @@ variants=(
 )
 
 declare -A php_version=(
-    [default]='8.2'
-    [5]='8.2'
-    [4]='8.1'
+    [default]='8.3'
+    [5]='8.3'
+    [4]='8.2'
 )
 
 declare -A cmd=(
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: @@
       workflow_dispatch:
     env:
-      bashbrew-version: 0.1.9
+      bashbrew-version: 0.1.12
     jobs:
@@ Expand Down @@