Update Plone backend to 6.0.6, Volto frontend to 16.23.0

Update docker compose stack versions to 3.8 Update workflow actions Fix OSI container image labels for frontednd and backend
plone · Sep 10, 2023 · 154a803 · 154a803
1 parent 5fb7d21
commit 154a803
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 22 deletions.
diff --git a/.github/workflows/backend-testing.yml b/.github/workflows/backend-testing.yml
@@ -23,7 +23,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
@@ -35,7 +35,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
@@ -48,7 +48,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
@@ -74,7 +74,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
@@ -89,7 +89,7 @@ jobs:
       - meta
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run tests
         run: |
@@ -104,7 +104,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta
@@ -130,7 +130,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64
           context: backend
@@ -153,7 +153,7 @@ jobs:
       url: testing.ploneconf.org
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Deploy to cluster
         uses: kitconcept/docker-stack-deploy@v1.2.0

diff --git a/.github/workflows/frontend-testing.yml b/.github/workflows/frontend-testing.yml
@@ -23,7 +23,7 @@ jobs:
       VOLTO_VERSION: ${{ steps.vars.outputs.VOLTO_VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set Env Vars
         id: vars
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Main checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Linting
         run: |
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Test
         run: |
@@ -90,7 +90,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64
           context: frontend/
@@ -113,7 +113,7 @@ jobs:
       url: testing.ploneconf.org
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Deploy to cluster
         uses: kitconcept/docker-stack-deploy@v1.2.0

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,13 @@
+2023-09-10 unreleased
+---------------------
+
+- Update Plone backend to 6.0.6, Volto frontend to 16.23.0
+- Update docker compose stack versions to 3.8
+- Update workflow actions
+- Fix OSI container image labels for frontednd and backend
+  [fredvd]
+
+
 2023-08-23 1.15
 --------------
 

diff --git a/backend/dockerfiles/Dockerfile b/backend/dockerfiles/Dockerfile
@@ -21,7 +21,7 @@ EOT
 FROM plone/server-prod-config:${PLONE_VERSION}
 
 LABEL maintainer="Plone Foundation <conf@plone.org>" \
-      org.label-schema.name="ploneconf-backend" \
+      org.label-schema.name="ploneconf-2023-backend" \
       org.label-schema.description="Plone Conference 2023 backend." \
       org.label-schema.vendor="Plone Foundation"
 

diff --git a/backend/version.txt b/backend/version.txt
@@ -1 +1 @@
-6.0.2
+6.0.6
diff --git a/devops/stacks/2023.ploneconf.org.yml b/devops/stacks/2023.ploneconf.org.yml
@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.8"
 
 services:
   frontend:

diff --git a/devops/stacks/testing.ploneconf.org.yml b/devops/stacks/testing.ploneconf.org.yml
@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.8"
 
 services:
   frontend:

diff --git a/frontend/dockerfiles/Dockerfile b/frontend/dockerfiles/Dockerfile
@@ -17,9 +17,9 @@ EOT
 
 FROM plone/frontend-prod-config:${VOLTO_VERSION}
 
-LABEL maintainer="kitconcept GmbH <server@kitconcept.com>" \
-      org.label-schema.name="intra.kitconcept.com-frontend" \
-      org.label-schema.description="kitconcept Intranet frontend image." \
-      org.label-schema.vendor="kitconcept GmbH"
+LABEL maintainer="Plone Foundation <conf@plone.org>" \
+      org.label-schema.name="ploneconf-2023-frontend" \
+      org.label-schema.description="Plone Conference 2023 frontend." \
+      org.label-schema.vendor="Plone Foundation"
 
 COPY --from=builder /app/ /app/
diff --git a/frontend/version.txt b/frontend/version.txt
@@ -1 +1 @@
-16.17.1
+16.23.0