Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Plone backend to 6.0.6, Volto frontend to 16.23.0 #29

Merged
merged 1 commit into from
Sep 10, 2023
Merged

Update Plone backend to 6.0.6, Volto frontend to 16.23.0 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/backend-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -89,7 +89,7 @@ jobs:
- meta

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run tests
run: |
Expand All @@ -104,7 +104,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Docker meta
id: meta
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/frontend-testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,7 +36,7 @@ jobs:

steps:
- name: Main checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Linting
run: |
Expand All @@ -49,7 +49,7 @@ jobs:

steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Test
run: |
Expand Down Expand Up @@ -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/
Expand All @@ -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
Expand Down
10 changes: 10 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
--------------

Expand Down
2 changes: 1 addition & 1 deletion backend/dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion backend/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.2
6.0.6
2 changes: 1 addition & 1 deletion devops/stacks/2023.ploneconf.org.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.3"
version: "3.8"

services:
frontend:
Expand Down
2 changes: 1 addition & 1 deletion devops/stacks/testing.ploneconf.org.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.3"
version: "3.8"

services:
frontend:
Expand Down
8 changes: 4 additions & 4 deletions frontend/dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
2 changes: 1 addition & 1 deletion frontend/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.17.1
16.23.0