From 33e036090510e7111ccab8ee4f75bee7a7e5c568 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 21 Nov 2024 11:44:30 +0000 Subject: [PATCH 1/3] Update CHANGELOG for 2.11.0 --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dd4b0c..095a479 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +#### 2.11.0: Release + + - Ensure the broker service name doesn't change (#168) + - ci: Introduce workflow for testing docker compose (#166) + - Update Node-RED version in Docker compose (#162) + - chore: Refactor docker-compose to simplify installation experience (#160) + - First pass at TeamBroker (#165) @hardillb + - fix: Remove interpolation when creating TLS certificates (#164) @ppawlowski + #### 2.10.0: Release - Introduce quick-start compose file (#158) @ppawlowski From 40a70e0f635013ee3117166f26477ef7faf02623 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 21 Nov 2024 11:44:30 +0000 Subject: [PATCH 2/3] Update version to 2.11.0 --- docker-compose.yml | 4 ++-- file-server/package.json | 4 ++-- flowforge-docker/package.json | 6 +++--- node-red-container/package.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index aab4275..886bb37 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -460,7 +460,7 @@ services: volumes: - emqx:/opt/emqx/data forge: - image: "flowfuse/forge-docker:2.10.0" + image: "flowfuse/forge-docker:2.11.0 networks: - flowforge restart: always @@ -479,7 +479,7 @@ services: - "broker" file-server: - image: "flowfuse/file-server:2.10.0" + image: "flowfuse/file-server:2.11.0 networks: - flowforge restart: always diff --git a/file-server/package.json b/file-server/package.json index 4ecdd97..24b09aa 100644 --- a/file-server/package.json +++ b/file-server/package.json @@ -1,9 +1,9 @@ { "name": "@flowfuse/file-server-container", - "version": "2.10.0", + "version": "2.11.0", "private": true, "dependencies": { - "@flowfuse/file-server": "^2.10.0" + "@flowfuse/file-server": "^2.11.0" }, "license": "Apache-2.0" } diff --git a/flowforge-docker/package.json b/flowforge-docker/package.json index ba99adb..8b1d476 100644 --- a/flowforge-docker/package.json +++ b/flowforge-docker/package.json @@ -1,14 +1,14 @@ { "name": "@flowfuse/docker-deployment", "description": "FlowFuse in Docker", - "version": "2.10.0", + "version": "2.11.0", "private": true, "author": { "name": "FlowForge Inc." }, "dependencies": { - "@flowfuse/flowfuse": "^2.10.0", - "@flowfuse/driver-docker": "^2.10.0", + "@flowfuse/flowfuse": "^2.11.0", + "@flowfuse/driver-docker": "^2.11.0", "pg": "^8.7.1", "pg-hstore": "^2.3.4" }, diff --git a/node-red-container/package.json b/node-red-container/package.json index 4e533cd..3675392 100644 --- a/node-red-container/package.json +++ b/node-red-container/package.json @@ -1,7 +1,7 @@ { "name": "node-red-project", "description": "A Node-RED Project", - "version": "2.10.0", + "version": "2.11.0", "private": true, "dependencies": {} } From bb4092f84a012eadda08415522657b85dcc2c718 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Thu, 21 Nov 2024 11:46:54 +0000 Subject: [PATCH 3/3] Fix value quoting --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 886bb37..684dc7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -460,7 +460,7 @@ services: volumes: - emqx:/opt/emqx/data forge: - image: "flowfuse/forge-docker:2.11.0 + image: "flowfuse/forge-docker:2.11.0" networks: - flowforge restart: always @@ -479,7 +479,7 @@ services: - "broker" file-server: - image: "flowfuse/file-server:2.11.0 + image: "flowfuse/file-server:2.11.0" networks: - flowforge restart: always