Skip to content

Commit 1ef1d44

Browse files
upgradingdaveupgradingdave
authored
Merge pull request #78 from camunda-community-hub/dave-update-for-8.5.2
Update for 8.5.2
2 parents 33b7f4e + e16ec9f commit 1ef1d44

18 files changed

Lines changed: 1360 additions & 114 deletions

‎.env‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
## Image versions ##
22
# renovate: datasource=docker depName=camunda/connectors-bundle
3-
CAMUNDA_CONNECTORS_VERSION=8.4.3
4-
CAMUNDA_PLATFORM_VERSION=8.4.0
3+
CAMUNDA_CONNECTORS_VERSION=8.5.3
4+
CAMUNDA_PLATFORM_VERSION=8.5.2
55
# renovate: datasource=docker depName=camunda/optimize
6-
CAMUNDA_OPTIMIZE_VERSION=8.4.0
6+
CAMUNDA_OPTIMIZE_VERSION=8.5.2
77
# renovate: datasource=docker depName=camunda/web-modeler lookupName=registry.camunda.cloud/web-modeler-ee/modeler-restapi
8-
CAMUNDA_WEB_MODELER_VERSION=8.4.1
8+
CAMUNDA_WEB_MODELER_VERSION=8.5.3
99
# renovate: datasource=docker depName=elasticsearch
10-
ELASTIC_VERSION=8.11.4
10+
ELASTIC_VERSION=8.14.1
1111
KEYCLOAK_SERVER_VERSION=21.1.2
12-
MAILPIT_VERSION=v1.9.9
12+
# renovate: datasource=docker depName=axllent/mailpit
13+
MAILPIT_VERSION=v1.18.5
1314
POSTGRES_VERSION=14.5-alpine
1415
HOST=localhost
1516

‎.github/workflows/release-generation.yaml‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
name: "Release - Generation"
2+
3+
on:
4+
push:
5+
tags:
6+
# Example: 8.4-gen1
7+
- 8\.\d+\-gen\d+
8+
# Example: 8.6.0-alpha1
9+
- 8\.\d+\-alpha\d+
10+
11+
jobs:
12+
release_script:
13+
runs-on: ubuntu-latest
14+
name: Build release notes
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- name: Setup Go
19+
uses: actions/setup-go@v5
20+
with:
21+
go-version: "1.20"
22+
23+
- name: Build
24+
working-directory: ./release-notes-fetcher
25+
run: go build
26+
27+
- name: Generate token for Camunda GitHub org
28+
id: generate-camunda-github-token
29+
uses: tibdex/github-app-token@v1
30+
with:
31+
app_id: ${{ secrets.APP_ID }}
32+
private_key: ${{ secrets.APP_PRIVATE_KEY }}
33+
34+
- name: Generate token for Camunda Cloud GitHub org
35+
id: generate-camunda-cloud-github-token
36+
uses: tibdex/github-app-token@v1
37+
with:
38+
app_id: ${{ secrets.APP_ID }}
39+
private_key: ${{ secrets.APP_PRIVATE_KEY }}
40+
repository: camunda-cloud/identity
41+
42+
- name: Set Camunda release tag var
43+
run: |
44+
echo "CAMUNDA_RELEASE_NAME=${GITHUB_REF_NAME}" >> "${GITHUB_ENV}"
45+
46+
- name: Set Camunda application vars
47+
run: |
48+
CAMUNDA_VERSION="$(echo ${CAMUNDA_RELEASE_NAME} | awk -F '-' '{print $1}')"
49+
CONFIG_FILE="release-notes-fetcher/config/release-notes-fetcher-camunda-${CAMUNDA_VERSION}.yaml"
50+
export GLOBAL_GITREF="$(yq '.gitRef.global' ${CONFIG_FILE})"
51+
52+
# Generate env var from git ref for all apps.
53+
# This will generate env vars like "ZEEBE_GITREF".
54+
yq '.gitRef | omit(["global"]) | keys' "${CONFIG_FILE}" | sed 's/- //g' |
55+
while read APP_NAME; do
56+
APP_REF="$(APP_NAME=${APP_NAME} yq '.gitRef.[env(APP_NAME)] // env(GLOBAL_GITREF)' ${CONFIG_FILE})"
57+
echo "${APP_NAME^^}_GITREF=${APP_REF}" >> "${GITHUB_ENV}"
58+
done
59+
60+
- name: Run release notes script
61+
working-directory: ./release-notes-fetcher
62+
run: set -o pipefail; ./release-notes-fetcher | tee release_notes.txt
63+
env:
64+
GITHUB_CAMUNDA_ACCESS_TOKEN: ${{ steps.generate-camunda-github-token.outputs.token }}
65+
GITHUB_CAMUNDA_CLOUD_ACCESS_TOKEN: ${{ steps.generate-camunda-cloud-github-token.outputs.token }}
66+
67+
- name: Login to gh repo
68+
working-directory: ./release-notes-fetcher
69+
run: echo ${{ steps.generate-camunda-github-token.outputs.token }} | gh auth login --with-token
70+
71+
- name: Edit release notes with output from script
72+
working-directory: ./release-notes-fetcher
73+
run: gh release edit --notes-file release_notes.txt -R camunda/camunda-platform ${CAMUNDA_RELEASE_NAME}
74+
75+
- name: Create temporary directory for asset download/upload
76+
working-directory: ./release-notes-fetcher
77+
run: mkdir -p tmp
78+
79+
# Tasklist binaries are uploaded to zeebes repo
80+
- name: Download Zeebe resources
81+
working-directory: ./release-notes-fetcher/tmp
82+
run: |
83+
gh release download "${ZEEBE_GITREF}" \
84+
-R camunda/camunda \
85+
-p "zbctl" \
86+
-p "zbctl.sha1sum" \
87+
-p "zbctl.exe" \
88+
-p "zbctl.exe.sha1sum" \
89+
-p "zbctl.darwin" \
90+
-p "zbctl.darwin.sha1sum" \
91+
-p "camunda-zeebe-${ZEEBE_GITREF}.tar.gz" \
92+
-p "camunda-zeebe-${ZEEBE_GITREF}.tar.gz.sha1sum" \
93+
-p "camunda-zeebe-${ZEEBE_GITREF}.zip" \
94+
-p "camunda-zeebe-${ZEEBE_GITREF}.zip.sha1sum" \
95+
-p "camunda-tasklist-${ZEEBE_GITREF}.zip" \
96+
-p "camunda-tasklist-${ZEEBE_GITREF}.zip.sha1sum" \
97+
-p "camunda-tasklist-${ZEEBE_GITREF}.tar.gz" \
98+
-p "camunda-tasklist-${ZEEBE_GITREF}.tar.gz.sha1sum"
99+
100+
- name: Download Operate resources from monorepo
101+
if: ${{ startsWith(env.CAMUNDA_RELEASE_NAME, '8.5') }}
102+
working-directory: ./release-notes-fetcher/tmp
103+
run: |
104+
gh release download "operate-${OPERATE_GITREF}" \
105+
-R camunda/camunda \
106+
-p "camunda-operate-${OPERATE_GITREF}.zip" \
107+
-p "camunda-operate-${OPERATE_GITREF}.zip.sha1sum" \
108+
-p "camunda-operate-${OPERATE_GITREF}.tar.gz" \
109+
-p "camunda-operate-${OPERATE_GITREF}.tar.gz.sha1sum" \
110+
111+
- name: Download Operate resources
112+
if: ${{ !startsWith(env.CAMUNDA_RELEASE_NAME, '8.5') }}
113+
working-directory: ./release-notes-fetcher/tmp
114+
run: |
115+
gh release download "${OPERATE_GITREF}" \
116+
-R camunda/operate \
117+
-p "camunda-operate-${OPERATE_GITREF}.zip" \
118+
-p "camunda-operate-${OPERATE_GITREF}.zip.sha1sum" \
119+
-p "camunda-operate-${OPERATE_GITREF}.tar.gz" \
120+
-p "camunda-operate-${OPERATE_GITREF}.tar.gz.sha1sum" \
121+
122+
- name: Login to Camunda Cloud
123+
working-directory: ./release-notes-fetcher
124+
run: echo ${{ steps.generate-camunda-cloud-github-token.outputs.token }} | gh auth login --with-token
125+
126+
- name: Download Identity resources
127+
working-directory: ./release-notes-fetcher/tmp
128+
run: |
129+
gh release download "${IDENTITY_GITREF}" \
130+
-R camunda-cloud/identity \
131+
-p "camunda-identity-${IDENTITY_GITREF}.tar.gz" \
132+
-p "camunda-identity-${IDENTITY_GITREF}.tar.gz.sha1sum" \
133+
-p "camunda-identity-${IDENTITY_GITREF}.zip" \
134+
-p "camunda-identity-${IDENTITY_GITREF}.zip.sha1sum"
135+
136+
- name: Login back to Camunda
137+
working-directory: ./release-notes-fetcher
138+
run: echo ${{ steps.generate-camunda-github-token.outputs.token }} | gh auth login --with-token
139+
140+
- name: Upload resources
141+
working-directory: ./release-notes-fetcher/tmp
142+
run: gh release -R camunda/camunda-platform upload "${CAMUNDA_RELEASE_NAME}" *

‎README.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ and links to Camunda Platform 8 resources, the official release artifacts (binar
99

1010
:warning: **Docker Compose is only recommended for local development.** :warning:
1111

12-
We recommend using [SaaS](https://camunda.com/get-started/) or [Helm/Kubernetes](https://docs.camunda.io/docs/next/self-managed/platform-deployment/helm-kubernetes/overview/) for development.
1312

14-
For more information about Self-Managed, including additional [development installation options](https://docs.camunda.io/docs/next/self-managed/platform-deployment/overview/#development), see our [documentation](https://docs.camunda.io/docs/next/self-managed/about-self-managed/).
13+
We recommend using [SaaS](https://camunda.com/get-started/) or [Helm/Kubernetes](https://docs.camunda.io/docs/self-managed/setup/overview/) for development.
1514

16-
For production setups we recommend using [Helm charts](https://docs.camunda.io/docs/self-managed/platform-deployment/kubernetes-helm/) which can be found at [helm.camunda.io](https://helm.camunda.io/).
15+
For more information about Self-Managed, including additional [development installation options](https://docs.camunda.io/docs/self-managed/setup/overview/), see our [documentation](https://docs.camunda.io/docs/self-managed/about-self-managed/).
16+
17+
18+
For production setups we recommend using [Helm charts](https://docs.camunda.io/docs/self-managed/setup/install/) which can be found at [helm.camunda.io](https://helm.camunda.io/).
1719

1820
## First steps with the application
1921

@@ -64,7 +66,7 @@ git remote set-url origin git@gitlab.com:new-project/new-repo
6466
- [Zeebe Workflow Engine](https://github.com/camunda/zeebe)
6567
- [Contact](https://docs.camunda.io/contact/)
6668

67-
## Using docker compose
69+
## Using Docker Compose
6870

6971
> :information_source: The docker-compose file in this repository uses the latest [compose specification](https://docs.docker.com/compose/compose-file/), which was introduced with docker compose version 1.27.0+. Please make sure to use an up-to-date docker compose version.
7072
@@ -267,7 +269,7 @@ $ DOCKER_BUILDKIT=0 docker build -t bitnami/keycloak:19.0.3 "https://github.com/
267269

268270
## Resource based authorizations
269271

270-
You can control access to specific processes and decision tables in Operate and Tasklist with [resource based authorization](https://docs.camunda.io/docs/self-managed/concepts/access-control/resource-authorizations/).
272+
You can control access to specific processes and decision tables in Operate and Tasklist with [resource-based authorization](https://docs.camunda.io/docs/self-managed/concepts/access-control/resource-authorizations/).
271273

272274
This feature is disabled by default and can be enabled by setting
273275
`RESOURCE_AUTHORIZATIONS_ENABLED` to `true`, either via the [`.env`](.env) file or through the command line:
@@ -293,7 +295,7 @@ ZEEBE_AUTHENICATION_MODE=identity MULTI_TENANCY_ENABLED=true docker compose up -
293295

294296
As seen above the feature also requires you to use `identity` as an authentication provider.
295297

296-
Ensure you [setup tenants in identity](https://docs.camunda.io/docs/self-managed/identity/user-guide/tenants/managing-tenants/) after you started the platform.
298+
Ensure you [setup tenants in identity](https://docs.camunda.io/docs/self-managed/identity/user-guide/tenants/managing-tenants/) after you start the platform.
297299

298300
## Camunda Platform 7
299301

‎RELEASE.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Release process
2+
3+
There are 2 components to keep in mind when releasing a version in this repository:
4+
5+
1. The .env and docker-compose.yaml's in the root of this directory
6+
2. The release notes published in the GitHub Releases page.
7+
8+
## How to handle an alpha release
9+
10+
1. If it's the first alpha release in the minor release cycle, create a `stable/8.x` branch
11+
2. Update .env (make sure that the versions of each component are updated with the latest version or alpha, and that if the component is a third-party dependency, that it abides by [Supported Environments](https://docs.camunda.io/docs/reference/supported-environments/)
12+
3. Create a release, and check on the github actions to ensure the release notes gets properly generated.
13+
14+
15+
## How to handle a minor release
16+
17+
1. Update .env (make sure that the versions of each component are updated with the latest version or alpha, and that if the component is a third-party dependency, that it abides by [Supported Environments](https://docs.camunda.io/docs/reference/supported-environments/)
18+
2. generate release notes like normal. If a `stable/8.x` branch for the minor release does not already exist, create it.
19+
3. add entries into `.github/renovate.json5` to ensure that patch release gets upgraded.
20+
21+
## How to do patch release
22+
23+
1. Update .env (make sure that the versions of each component are updated, and that if the component is a third-party dependency, that it abides by [Supported Environments](https://docs.camunda.io/docs/reference/supported-environments/)
24+
2. Merge renovate PRs if any are open (wait for CI to pass)
25+
3. generate release notes like normal
26+
27+
28+
## How to generate release notes
29+
30+
1. Navigate to the [Releases page](https://github.com/camunda/camunda-platform/releases)
31+
2. Click "Draft a new release"
32+
3. Create a tag named the version number
33+
4. Target the branch of the stable/x.x version you're releasing (or main)
34+
5. Add a release title
35+
6. Publish Release
36+
7. Ensure the CI workflow completes successfully: [Release workflow](https://github.com/camunda/camunda-platform/actions/workflows/release.yaml)
37+
8. Make sure the release notes show up here with the necessary artifacts: [Releases](https://github.com/camunda/camunda-platform/releases)

‎docker-compose-core.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ services:
1717
ports:
1818
- "26500:26500"
1919
- "9600:9600"
20+
- "8088:8080"
2021
environment: # https://docs.camunda.io/docs/self-managed/zeebe-deployment/configuration/environment-variables/
2122
- ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_CLASSNAME=io.camunda.zeebe.exporter.ElasticsearchExporter
2223
- ZEEBE_BROKER_EXPORTERS_ELASTICSEARCH_ARGS_URL=http://elasticsearch:9200
@@ -26,7 +27,7 @@ services:
2627
- ZEEBE_BROKER_DATA_DISKUSAGECOMMANDWATERMARK=0.998
2728
- ZEEBE_BROKER_DATA_DISKUSAGEREPLICATIONWATERMARK=0.999
2829
- "JAVA_TOOL_OPTIONS=-Xms512m -Xmx512m"
29-
restart: always
30+
restart: unless-stopped
3031
healthcheck:
3132
test: [ "CMD-SHELL", "timeout 10s bash -c ':> /dev/tcp/127.0.0.1/9600' || exit 1" ]
3233
interval: 30s
@@ -70,6 +71,7 @@ services:
7071
- "8082:8080"
7172
environment: # https://docs.camunda.io/docs/self-managed/tasklist-deployment/configuration/
7273
- CAMUNDA_TASKLIST_ZEEBE_GATEWAYADDRESS=zeebe:26500
74+
- CAMUNDA_TASKLIST_ZEEBE_RESTADDRESS=http://zeebe:8080
7375
- CAMUNDA_TASKLIST_ELASTICSEARCH_URL=http://elasticsearch:9200
7476
- CAMUNDA_TASKLIST_ZEEBEELASTICSEARCH_URL=http://elasticsearch:9200
7577
- management.endpoints.web.exposure.include=health
@@ -129,7 +131,7 @@ services:
129131
memlock:
130132
soft: -1
131133
hard: -1
132-
restart: always
134+
restart: unless-stopped
133135
healthcheck:
134136
test: [ "CMD-SHELL", "curl -f http://localhost:9200/_cat/health | grep -q green" ]
135137
interval: 30s

‎docker-compose-web-modeler.yaml‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,25 @@ services:
2323
POSTGRES_PASSWORD: modeler-db-password
2424
networks:
2525
- modeler
26+
volumes:
27+
- postgres-web:/var/lib/postgresql/data
2628

2729
modeler-websockets:
2830
container_name: modeler-websockets
2931
image: registry.camunda.cloud/web-modeler-ee/modeler-websockets:${CAMUNDA_WEB_MODELER_VERSION}
3032
ports:
3133
- "8060:8060"
3234
healthcheck:
33-
test: /usr/bin/nc -v localhost 8060
34-
interval: 30s
35+
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:8060/up" ]
36+
interval: 5s
37+
timeout: 15s
38+
retries: 30
3539
environment:
3640
APP_NAME: "Web Modeler Self-Managed WebSockets"
3741
APP_DEBUG: "true"
3842
PUSHER_APP_ID: modeler-app
3943
PUSHER_APP_KEY: modeler-app-key
4044
PUSHER_APP_SECRET: modeler-app-secret
41-
PUSHER_APP_CLUSTER: modeler
4245
networks:
4346
- modeler
4447

@@ -70,9 +73,10 @@ services:
7073
identity:
7174
condition: service_healthy
7275
healthcheck:
73-
test: /usr/bin/nc -v localhost 8081
74-
interval: 30s
75-
retries: 10
76+
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8091/health/readiness" ]
77+
interval: 5s
78+
timeout: 15s
79+
retries: 30
7680
environment:
7781
JAVA_OPTIONS: -Xmx128m
7882
LOGGING_LEVEL_IO_CAMUNDA_MODELER: DEBUG
@@ -106,10 +110,10 @@ services:
106110
modeler-restapi:
107111
condition: service_healthy
108112
healthcheck:
109-
test: /usr/bin/nc -v localhost 8070
110-
interval: 30s
113+
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8071/health/readiness" ]
114+
interval: 5s
111115
timeout: 15s
112-
retries: 5
116+
retries: 30
113117
environment:
114118
RESTAPI_HOST: modeler-restapi
115119
SERVER_HOST: modeler-webapp
@@ -136,4 +140,7 @@ services:
136140

137141
networks:
138142
camunda-platform:
139-
modeler:
143+
modeler:
144+
145+
volumes:
146+
postgres-web:

0 commit comments

Comments
 (0)