Update database connetion, add DB_PORT. Update Github Action versions

.github/workflows/backend-testing.yml

@@ -1,10 +1,21 @@
 name: Backend testing.plone.de CI and Deploy
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - 'backend/**'
-  workflow_dispatch:
+
+env:
+  IMAGE_NAME_PREFIX: ghcr.io/plone/plone.de
+  IMAGE_NAME_SUFFIX: backend
+  PYTHON_VERSION: "3.12"
+  STACK_PARAM: latest
+  STACK_NAME: testing-plone-de
+  STACK_PREFIX: testing_plonede
+  PUBLIC_URL: testing.plone.de
+  CERTRESOLVER: le-cloudflare
+  STACK_FILE: devops/stacks/testing.plone.de.yml
 
 jobs:
   meta:
@@ -15,7 +26,7 @@ jobs:
       PLONE_VERSION: ${{ steps.vars.outputs.PLONE_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set Env Vars
         id: vars
@@ -47,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -60,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -73,7 +84,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -122,11 +133,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/plone/plonede-backend
@@ -138,17 +149,17 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64
           context: backend
@@ -177,12 +188,18 @@ jobs:
         with:
           registry: 'ghcr.io'
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.DEPLOY_GHCR_READ_TOKEN }}
           remote_host: ${{ vars.DEPLOY_HOST }}
           remote_port: ${{ vars.DEPLOY_PORT }}
           remote_user: ${{ vars.DEPLOY_USER }}
           remote_private_key: ${{ secrets.DEPLOY_SSH }}
           stack_file: 'devops/stacks/testing.plone.de.yml'
           stack_name: 'testing-plone-de'
-          env_file: ${{ secrets.ENV_FILE }}
+          env_file: |
+            STACK_NAME=${{ env.STACK_NAME }}
+            DB_HOST=${{ vars.DB_HOST }}
+            DB_PORT=${{ vars.DB_PORT }}
+            DB_NAME=${{ vars.DB_NAME }}
+            DB_USER=${{ vars.DB_USER }}
+            DB_PASSWORD=${{ secrets.DB_PASSWORD }}
           deploy_timeout: 480

.github/workflows/codeanalysis.yml

@@ -14,10 +14,10 @@ jobs:
         working-directory: ./frontend
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.node-version }}
           cache: 'yarn'
@@ -36,7 +36,7 @@ jobs:
         working-directory: ./frontend
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install packages
         run: make install
@@ -53,10 +53,10 @@ jobs:
 
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.node-version }}
           cache: 'yarn'
@@ -72,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -84,7 +84,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -96,7 +96,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2
@@ -108,7 +108,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run check
         uses: plone/code-analysis-action@v2

.github/workflows/frontend-testing.yml

@@ -7,7 +7,16 @@ on:
       - 'frontend/**'
 
 env:
-  node-version: 20.x
+  node-version: 22.x
+  IMAGE_NAME_PREFIX: ghcr.io/plone/plone.de
+  IMAGE_NAME_SUFFIX: frontend
+  PYTHON_VERSION: "3.12"
+  STACK_PARAM: latest
+  STACK_NAME: testing-plone-de
+  STACK_PREFIX: testing_plonede
+  PUBLIC_URL: testing.plone.de
+  CERTRESOLVER: le-cloudflare
+  STACK_FILE: devops/stacks/testing.plone.de.yml
 
 defaults:
   run:
@@ -22,7 +31,7 @@ jobs:
       PLONE_VERSION: ${{ steps.vars.outputs.PLONE_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set Env Vars
         working-directory: "."
@@ -43,10 +52,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.node-version }}
           cache: 'yarn'
@@ -63,7 +72,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install packages
         run: make install
@@ -77,10 +86,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.node-version }}
           cache: 'yarn'
@@ -97,10 +106,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Use Node.js ${{ env.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.node-version }}
           cache: 'yarn'
@@ -119,14 +128,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
-            ghcr.io/plone/plonede-frontend
+            ${{ env.IMAGE_NAME_PREFIX }}-${{ env.IMAGE_NAME_SUFFIX }}
+          labels: |
+            org.label-schema.docker.cmd=docker run -d -p 8080:8080 ${{ env.IMAGE_NAME_PREFIX }}-${{ env.IMAGE_NAME_SUFFIX }}:latest
           flavor: |
             latest=false
           tags: |
@@ -135,17 +146,17 @@ jobs:
             type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64
           context: frontend/
@@ -167,7 +178,7 @@ jobs:
       url: https://testing.plone.de
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Deploy to testing.plone.de
         uses: kitconcept/docker-stack-deploy@v1.2.0
@@ -181,5 +192,11 @@ jobs:
           remote_private_key: ${{ secrets.DEPLOY_SSH }}
           stack_file: 'devops/stacks/testing.plone.de.yml'
           stack_name: 'testing-plone-de'
-          env_file: ${{ secrets.ENV_FILE }}
+          env_file: |
+            STACK_NAME=${{ env.STACK_NAME }}
+            DB_HOST=${{ vars.DB_HOST }}
+            DB_PORT=${{ vars.DB_PORT }}
+            DB_NAME=${{ vars.DB_NAME }}
+            DB_USER=${{ vars.DB_USER }}
+            DB_PASSWORD=${{ secrets.DB_PASSWORD }}
           deploy_timeout: 480

.github/workflows/redeploy-live.yml

@@ -11,7 +11,7 @@ jobs:
       TAG: ${{ steps.vars.outputs.TAG }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set Env Vars
         id: vars
@@ -29,7 +29,7 @@ jobs:
       url: https://plone.de
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Deploy to cluster
         uses: kitconcept/docker-stack-deploy@v1.2.0

.github/workflows/redeploy-testing.yml

@@ -14,7 +14,7 @@ jobs:
       url: https://testing.plone.de
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Deploy to cluster
         uses: kitconcept/docker-stack-deploy@v1.2.0

CHANGELOG.md

@@ -1,7 +1,9 @@
 ## 1.0.14 (unreleased)
 
 
-- Nothing changed yet.
+- Update Github Action versions. 
+- Fix deploy token for testing stack.
+- Fix instance-filestorage blobs directive. [fredvd]
 
 
 ## 1.0.13 (2024-09-06)

backend/.python-version

@@ -1 +1 @@
-3.11
+3.11.10

backend/constraints.txt

@@ -1 +1 @@
--c https://dist.plone.org/release/6.0.10.1/constraints.txt
+-c https://dist.plone.org/release/6.0.14/constraints.txt

backend/instance-filestorage.yaml

@@ -2,12 +2,11 @@ default_context:
   initial_user_name: 'admin'
   initial_user_password: 'admin'
 
-  load_zcml:
-    package_includes: ['plonede']
+  zcml_package_includes: 'plonede'
 
   dos_protection_available: true
 
   db_storage: direct
 
   db_filestorage_location: ../data/filestorage/Data.fs
-  db_blobs_location: ../data/blobs
+  db_blob_location: ../data/blobs

backend/version.txt

@@ -1 +1 @@
-6.0.10.1
+6.0.14

devops/stacks/plone.de.yml

@@ -33,7 +33,7 @@ services:
   backend:
     image: ghcr.io/plone/plonede-backend:${STACK_PARAM:-latest}
     environment:
-      RELSTORAGE_DSN: "dbname='${DB_NAME:-plone}' user='${DB_USER:-plone}' host='${DB_HOST:-db}' password='${DB_PASSWORD:-plone}'"
+      RELSTORAGE_DSN: "dbname='${DB_NAME:-plone}' user='${DB_USER:-plone}' host='${DB_HOST:-db}' port='${DB_PORT:-5432}' password='${DB_PASSWORD:-plone}'"
     networks:
     - plonede
     - public