Merge branch 'main' into develop

.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
@@ -143,7 +143,7 @@ jobs:
 
   deploy:
     if: ${{ github.ref == 'refs/heads/main' }}
-    concurrency: testing_deploy
+    concurrency: deploy_testing
     runs-on: ubuntu-latest
     needs:
       - release
@@ -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

.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

CHANGES.rst

@@ -1,188 +1,109 @@
-2023-06-19 1.14
---------------
+1.16.dev0 (unreleased)
+-----------------------
+
+- Fix ++api++/++api++/++api++ calls with Traefik filter rule
+  [ericof, fredvd]
+
+- Update Plone backend to 6.0.6, Volto frontend to 16.24.0
+- Update docker compose stack versions to 3.8
+- Update workflow actions
+- Fix OSI container image labels for frontednd and backend
+  [fredvd]
+
+
+1.15 (2023-08-23)
+-----------------
+
+- Bump volto-matomo
+  [ericof]
+
+1.14 (2023-06-19)
+-----------------
 
 - Schedule block style
   [libargutxi]
 
-2023-06-16 1.13
---------------
+1.13 (2023-06-16)
+-----------------
 
 - Speakers, Talks and filters
 - Small style changes
   [libargutxi]
 
-2023-05-12 1.11
---------------
+1.12 (2023-05-12)
+-----------------
 
 - Sponsor and News Item view
 - Small style changes
   [libargutxi]
 
-2023-04-18 1.10
---------------
+1.10 2023-04-18)
+----------------
 
 - Styled sponsors
   [libargutxi]
 
-2023-04-05 1.9
---------------
+1.9 (2023-04-05)
+----------------
 
 - Styled H2 block
   [ionlizarazu]
 
-2023-04-04 1.8
---------------
+1.8 (2023-04-04)
+----------------
 
 - Picture source default url
   [libargutxi]
 
-2023-04-04 1.7
---------------
+1.7 (2023-04-04)
+----------------
 
 - Picture source and frontend styles
   [libargutxi]
 
-2023-03-30 1.6
---------------
+1.6 (2023-03-30)
+----------------
 
 - Enable volto-authomatic
   [fredvd]
 
-2023-03-30 1.5
---------------
+1.5 (2023-03-30)
+----------------
 
 - Sponsors grid styles
   [libargutxi]
 
-2023-03-30 1.4
---------------
+1.4 (2023-03-30)
+----------------
 
 - Install captcha products for volto-form-block
   [erral]
 
-2023-03-30 1.3
---------------
+1.3 (2023-03-30)
+----------------
 
 - Frontend styles
   [libargutxi]
 
-2023-03-29 1.2
---------------
+1.2 (2023-03-29)
+----------------
 
 - Frontend styles
   [ionlizarazu & libargutxi]
 
 - Install captcha
   [erral]
 
-2023-03-29 1.1
+1.1 (2023-03-29)
 ----------------
 
 - teaser variations
   [libargutxi & ionlizarazu]
 
-2023-03-29 1.0.0
-----------------
+1.0.0 (2023-03-29)
+------------------
 
 - 2023 site design
   [libargutxi & ionlizarazu]
 
-
-2022 site
----------
-
-- restore hard space in Nuclia block text
-  [tkimnguyen]
-
-- Change Nuclia block text to include 2022 videos, hide Register Now call to action
-  [tkimnguyen]
-
-- Fix Venue block description
-  [mpeeters]
-
-- Update to Plone 6 b3 and Volto 16a41
-  [sneridagh]
-
-- Add styling and title to nuclia Block
-  [jchandelle]
-
-- Update Volto, pin several packages, update browserlist.
-  [sneridagh]
-
-- Add Nuclia block
-  [jchandelle]
-
-- Change sponsor logo size
-  [jchandelle]
-
-- Improve design of Schedule block
-  [jchandelle]
-
-- Fix Schedule block
-  [jchandelle]
-
-- Fix start and end dates to include timezone in ical view
-  [mpeeters]
-
-- Adapt session serializer to handle timezone correctly
-  [mpeeters]
-
-- Fix Schedule Block default value and trad
-  [jchandelle]
-
-- Add Schedule Block
-  [jchandelle]
-
-- Fix relationList empty error if editing an object with "presenters" field.
-  [sneridagh]
-
-- Add spaces between block
-  [jchandelle]
-
-- Fix Venue and Hero Image theming
-  [jchandelle]
-
-- Fix talk view css
-  [jchandelle]
-
-- Fix responsive for person view and Change schedule view
-  [jchandelle]
-
-- Restore volto-authomatic
-  [jchandelle, mpeeters]
-
-- improve design, ui and ux
-  [jchandelle, mpeeters]
-
-- implement design and related blocks
-  [jchandelle, tlambert, duchenean]
-
-2022-05-21
-----------
-
-- add notes and userful docker commands
-  [tkimnguyen]
-
-- update sizes for logo of sponsors
-  [ericof]
-
-- update tito block to point to 2022
-  [ericof]
-
-- Upgrade Plone to version 6.0.0b1
-  [ericof]
-
-- Upgrade pas.plugins.authomatic to version 1.0.0
-  [ericof]
-
-- Use @plone-collective/volto-authomatic
-  [ericof]
-
-- Use @plone-collective/volto-tito-block
-  [ericof]
-
-- Upgrade @plone/volto to version 16.0.0-alpha.17
-  [ericof]
-
-- Upgrade @plone/volto to version 16.0.0-alpha.20
-  [ericof]
+- Older changes taken from 2022 PloneConf site in ploneconf.org repo

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"
 

backend/version.txt

@@ -1 +1 @@
-6.0.2
+6.0.6

devops/stacks/2023.ploneconf.org.yml

@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.8"
 
 services:
   frontend:
@@ -54,6 +54,8 @@ services:
         ### ClassicUI Access Authentication
         - traefik.http.middlewares.2023_ploneconf-backend-auth.basicauth.users=ploneconf:$$2y$$05$$SLsKIKgK.NlD.64HMV42hOUNi3pQM/T.iW4qziWs0xcKHzkaa8T8C
         ### Backend ++api++ VHM
+        - "traefik.http.middlewares.2023_ploneconf-vhm-cleanup.replacepathregex.regex=^/((\\+\\+api\\+\\+/){1,})($$|.*)"
+        - "traefik.http.middlewares.2023_ploneconf-vhm-cleanup.replacepathregex.replacement=/VirtualHostBase/https/2023.ploneconf.org/Plone/++api++/VirtualHostRoot/$$3"
         - "traefik.http.middlewares.2023_ploneconf-vhm.replacepathregex.regex=^/\\+\\+api\\+\\+($$|/.*)"
         - "traefik.http.middlewares.2023_ploneconf-vhm.replacepathregex.replacement=/VirtualHostBase/https/2023.ploneconf.org/Plone/++api++/VirtualHostRoot/$$1"
         ### Backend ClassicUI VHM
@@ -65,7 +67,7 @@ services:
         - traefik.http.routers.2023_ploneconf-backend.entrypoints=https
         - traefik.http.routers.2023_ploneconf-backend.tls=true
         - traefik.http.routers.2023_ploneconf-backend.service=2023_ploneconf-backend
-        - traefik.http.routers.2023_ploneconf-backend.middlewares=gzip,2023_ploneconf-vhm
+        - traefik.http.routers.2023_ploneconf-backend.middlewares=gzip,2023_ploneconf-vhm-cleanup,2023_ploneconf-vhm
         ### ploneconf.org /ClassicUI - protected with basic auth (prevent SEOs from crawl it)
         - traefik.http.routers.2023_ploneconf-classicui.rule=Host(`2023.ploneconf.org`) && (PathPrefix(`/ClassicUI`))
         - traefik.http.routers.2023_ploneconf-classicui.entrypoints=https