.github/workflows/release_stable.yml

@@ -47,6 +47,12 @@ jobs:
           dockerhub_username: ${{ secrets.DOCKER_USERNAME }}
           dockerhub_token: ${{ secrets.DOCKER_TOKEN }}
 
+      - name: Check repository branch
+        id: branch
+        uses: GuillaumeFalourd/branch-exists@v1.1
+        with:
+          branch: ${{ steps.dotclear.outputs.tag }}
+
       - name: notfound
         if: (steps.registry.outputs.image_exists == 'false')
         run: |
@@ -59,11 +65,36 @@ jobs:
           SUMMARY=$'Image ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ steps.dotclear.outputs.tag }} found.'
           echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
 
-      - name: Check repository branch
-        id: branch
-        uses: GuillaumeFalourd/branch-exists@v1.1
+  do_branch:
+    needs: check_image
+    if: ((needs.check_image.outputs.has_branch == 'false') || (github.event.inputs.force_rebuild == 'true'))
+    name: Create repository branch
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Create repository branch
+        id: create
+        uses: peterjgrainger/action-create-branch@v3.0.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          branch: ${{ steps.dotclear.outputs.tag }}
+          branch: ${{ needs.check_image.outputs.version }}
+
+      - name: notfound
+        if: (steps.create.outputs.created == 'false')
+        run: |
+          SUMMARY=$'Branch ${{ needs.check_image.outputs.version }} has not been created.'
+          echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
+
+      - name: found
+        if: (steps.create.outputs.created == 'true')
+        run: |
+          SUMMARY=$' Branch ${{ needs.check_image.outputs.version }} has been created.'
+          echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
 
   do_image:
     needs: check_image
@@ -72,40 +103,13 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       packages: write
-      contents: write
+      contents: read
       attestations: write
       id-token: write
     steps:
       - name: Check out the repo
-        if: ((needs.check_image.outputs.has_branch == 'false') || (github.event.inputs.force_rebuild == 'true'))
         uses: actions/checkout@v4
 
-      - name: Create repository branch
-        if: ((needs.check_image.outputs.has_branch == 'false') || (github.event.inputs.force_rebuild == 'true'))
-        id: create
-        uses: peterjgrainger/action-create-branch@v3.0.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          branch: ${{ needs.check_image.outputs.version }}
-
-      - name: notcreated
-        if: (steps.create.outputs.created != 'true')
-        run: |
-          SUMMARY=$'Branch ${{ needs.check_image.outputs.version }} has not been created.'
-          echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
-
-      - name: created
-        if: (steps.create.outputs.created == 'true')
-        run: |
-          SUMMARY=$' Branch ${{ needs.check_image.outputs.version }} has been created.'
-          echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
-
-      - name: Check out the repo
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ needs.check_image.outputs.version }}
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 

.github/workflows/release_testing.yml

@@ -20,41 +20,8 @@ jobs:
       attestations: write
       id-token: write
     steps:
-      - name: Get last dotclear repository tag
-        id: dotclear
-        uses: oprypin/find-latest-tag@v1
-        with:
-          repository: dotclear/dotclear
-
-      - name: version
-        run: |
-          SUMMARY=$'Last Dotclear repository tag is ${{ steps.dotclear.outputs.tag }}.'
-          echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
-
-      - name: Create repository branch
-        id: create
-        uses: peterjgrainger/action-create-branch@v3.0.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          branch: ${{ steps.dotclear.outputs.tag }}
-
-      - name: notcreated
-        if: (steps.create.outputs.created != 'true')
-        run: |
-          SUMMARY=$'Branch ${{ needs.check_image.outputs.version }} has not been created.'
-          echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
-
-      - name: created
-        if: (steps.create.outputs.created == 'true')
-        run: |
-          SUMMARY=$' Branch ${{ needs.check_image.outputs.version }} has been created.'
-          echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
-
       - name: Check out the repo
         uses: actions/checkout@v4
-        with:
-          ref: ${{ steps.dotclear.outputs.tag }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

Dockerfile

@@ -54,8 +54,8 @@ COPY etc/snippets_common.conf /etc/nginx/snippets/snippets_common.conf
 RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.12/community/ gnu-libiconv=1.15-r2
 ENV LD_PRELOAD=/usr/lib/preloadable_libiconv.so
 
-# Use PHP 8.4 release
-ENV VER_PHP=php84
+# Use PHP 8.3 release
+ENV VER_PHP=php83
 
 # Install PHP required packages
 RUN apk add --no-cache --update \

docker-entrypoint.sh

@@ -88,11 +88,11 @@ VERSION_INSTALLED=$(sed -n "s/^\s*\"release_version\":\s*\"\(.*\)\",/\1/p" relea
 echo >&2 "| Summary: "
 echo >&2 "| Alpine $(cat /etc/alpine-release)"
 echo >&2 "| Nginx $(nginx -v 2>&1 | sed 's/nginx version: nginx\///')"
-echo >&2 "| PHP $(php84 -r "echo PHP_VERSION;")"
+echo >&2 "| PHP $(php -r "echo PHP_VERSION;")"
 echo >&2 "| Dotclear ${VERSION_INSTALLED}"
 
 # Start web server
-php-fpm84 -D # FPM must start first in daemon mode
+php-fpm83 -D # FPM must start first in daemon mode
 nginx # Then nginx in no daemon mode
 
 exec "$@"

etc/testing-php.ini

@@ -104,9 +104,9 @@ session.referer_check =
 session.cache_limiter = nocache
 session.cache_expire = 180
 session.use_trans_sid = 0
-#session.sid_length = 26
+session.sid_length = 26
 session.trans_sid_tags = "a=href,area=href,frame=src,form="
-#session.sid_bits_per_character = 5
+session.sid_bits_per_character = 5
 
 [opcache]
 opcache.enable=1

etc/unstable-php.ini

@@ -104,9 +104,9 @@ session.referer_check =
 session.cache_limiter = nocache
 session.cache_expire = 180
 session.use_trans_sid = 0
-#session.sid_length = 26
+session.sid_length = 26
 session.trans_sid_tags = "a=href,area=href,frame=src,form="
-#session.sid_bits_per_character = 5
+session.sid_bits_per_character = 5
 
 [opcache]
 opcache.enable=1