Skip to content

Commit 813b91f

Browse files
pankalogpankalog
committed
Update to OpenRemote 1.15.1, update to latest custom-project source
`openremote/custom-project` checkout commit SHA: `8e0ce0588ac999d72b5c6d8f241d50ac066c1251`
1 parent f2d67e7 commit 813b91f

9 files changed

Lines changed: 80 additions & 31 deletions

File tree

‎build_and_publish_to_docker.sh‎

Lines changed: 54 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,57 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
13

4+
# Configuration
5+
DOCKER_REPO="pankalog/fleet-deployment"
6+
COMPOSE_PROJECT="fleet-management"
7+
BUILDER_NAME="multi-platform-builder"
8+
PLATFORMS="linux/amd64,linux/arm64"
9+
MANAGER_VERSION="1.15.1"
10+
11+
# Derived values
12+
GIT_VERSION=$(git rev-parse --short HEAD)
13+
DEPLOYMENT_DIR="./build/deployment-${GIT_VERSION}"
14+
15+
echo "==> Building deployment version: $GIT_VERSION"
16+
echo "==> Deployment directory: $DEPLOYMENT_DIR"
17+
18+
# Clean deployment directory
19+
echo "==> Cleaning previous builds..."
20+
rm -rf ./deployment/build
21+
22+
# Build application
23+
echo "==> Running Gradle build..."
224
./gradlew clean installDist
3-
GIT_DEPLOYMENT_VERSION=$(git rev-parse --short HEAD)
25+
26+
# Prepare deployment artifacts
27+
cp -r ./deployment/build "$DEPLOYMENT_DIR"
28+
29+
# Docker multi-arch build
30+
echo "==> Building and pushing Docker images..."
431
docker login
5-
docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder
6-
docker buildx build --push --platform linux/amd64,linux/arm64 -t pankalog/fleet-deployment:"$GIT_DEPLOYMENT_VERSION" -t "pankalog/fleet-deployment:latest" --builder multi-platform-builder ./deployment/build/
7-
docker pull pankalog/fleet-deployment:$GIT_DEPLOYMENT_VERSION
8-
OR_ADMIN_PASSWORD=secret DEPLOYMENT_VERSION="$GIT_DEPLOYMENT_VERSION" docker compose -p fleet-management up
32+
docker buildx create --use --platform="$PLATFORMS" --name "$BUILDER_NAME" 2>/dev/null || true
33+
docker buildx build \
34+
--push \
35+
--platform "$PLATFORMS" \
36+
--builder "$BUILDER_NAME" \
37+
--no-cache \
38+
-t "${DOCKER_REPO}:${GIT_VERSION}" \
39+
-t "${DOCKER_REPO}:latest" \
40+
"$DEPLOYMENT_DIR"
41+
42+
# Deploy
43+
echo "==> Preparing deployment..."
44+
export OR_ADMIN_PASSWORD="${OR_ADMIN_PASSWORD:-secret}"
45+
export DEPLOYMENT_VERSION="$GIT_VERSION"
46+
export MANAGER_VERSION="$MANAGER_VERSION"
47+
48+
docker pull "${DOCKER_REPO}:${GIT_VERSION}"
49+
docker compose -p "$COMPOSE_PROJECT" pull deployment manager
50+
51+
echo "==> Stopping services and cleaning up..."
52+
docker compose -p "$COMPOSE_PROJECT" down -v
53+
54+
echo "==> Starting services with fresh images..."
55+
docker compose -p "$COMPOSE_PROJECT" up -d
56+
57+
echo "==> Deployment complete: $GIT_VERSION"

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ services:
104104
# <<: *awslogs
105105

106106
manager:
107-
image: openremote/manager:${MANAGER_VERSION:-latest}
107+
image: openremote/manager:${MANAGER_VERSION:-1.15.1}
108108
restart: always
109109
depends_on:
110110
keycloak:

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.parallel=true
33
projectName = fleet-management
44
version = 1.0-SNAPSHOT
55

6-
openremoteVersion = 1.15.2
6+
openremoteVersion = 1.15.1
77

88
jacksonVersion = 2.20.1
99
testLoggerVersion = 4.0.0

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"ui/demo/*"
1111
],
1212
"devDependencies": {
13-
"@openremote/util": "~1.15.2"
13+
"@openremote/util": "~1.15.1"
1414
}
1515
}

‎ui/app/custom-react/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"serve": "npx cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 rspack serve"
1212
},
1313
"dependencies": {
14-
"@openremote/core": "~1.15.2",
15-
"@openremote/model": "~1.15.2",
16-
"@openremote/or-mwc-components": "~1.15.2",
14+
"@openremote/core": "~1.15.1",
15+
"@openremote/model": "~1.15.1",
16+
"@openremote/or-mwc-components": "~1.15.1",
1717
"react": "^19.2.0",
1818
"react-dom": "^19.2.0"
1919
},

‎ui/app/custom/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
"test": "echo \"Error: no test specified\" && exit 1"
1919
},
2020
"dependencies": {
21-
"@openremote/manager": "~1.15.2",
21+
"@openremote/manager": "~1.15.1",
2222
"model": "workspace:*",
2323
"rest": "workspace:*"
2424
},
2525
"devDependencies": {
26-
"@openremote/util": "~1.15.2",
26+
"@openremote/util": "~1.15.1",
2727
"@rspack/cli": "~1.7.2",
2828
"@rspack/core": "~1.7.2",
2929
"css-loader": "^7.1.2",

‎ui/component/model/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"author": "OpenRemote",
2323
"license": "AGPL-3.0-or-later",
2424
"devDependencies": {
25-
"@openremote/util": "^1.15.2"
25+
"@openremote/util": "^1.15.1"
2626
},
2727
"publishConfig": {
2828
"access": "restricted"

‎ui/component/rest/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
"author": "OpenRemote",
2323
"license": "AGPL-3.0-or-later",
2424
"dependencies": {
25-
"@openremote/rest": "~1.15.2",
25+
"@openremote/rest": "~1.15.1",
2626
"model": "workspace:*",
2727
"qs": "^6.8.0"
2828
},
2929
"devDependencies": {
30-
"@openremote/util": "~1.15.2",
30+
"@openremote/util": "~1.15.1",
3131
"@rspack/core": "~1.7.2",
3232
"@types/qs": "^6.9.7"
3333
},

‎yarn.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ __metadata:
12631263
languageName: node
12641264
linkType: hard
12651265

1266-
"@openremote/core@npm:1.15.2, @openremote/core@npm:~1.15.2":
1266+
"@openremote/core@npm:1.15.2, @openremote/core@npm:~1.15.1":
12671267
version: 1.15.2
12681268
resolution: "@openremote/core@npm:1.15.2"
12691269
dependencies:
@@ -1287,9 +1287,9 @@ __metadata:
12871287
version: 0.0.0-use.local
12881288
resolution: "@openremote/custom-react@workspace:ui/app/custom-react"
12891289
dependencies:
1290-
"@openremote/core": "npm:~1.15.2"
1291-
"@openremote/model": "npm:~1.15.2"
1292-
"@openremote/or-mwc-components": "npm:~1.15.2"
1290+
"@openremote/core": "npm:~1.15.1"
1291+
"@openremote/model": "npm:~1.15.1"
1292+
"@openremote/or-mwc-components": "npm:~1.15.1"
12931293
"@rspack/cli": "npm:~1.7.2"
12941294
"@rspack/core": "npm:~1.7.2"
12951295
"@types/react": "npm:^19.2.2"
@@ -1307,8 +1307,8 @@ __metadata:
13071307
version: 0.0.0-use.local
13081308
resolution: "@openremote/custom@workspace:ui/app/custom"
13091309
dependencies:
1310-
"@openremote/manager": "npm:~1.15.2"
1311-
"@openremote/util": "npm:~1.15.2"
1310+
"@openremote/manager": "npm:~1.15.1"
1311+
"@openremote/util": "npm:~1.15.1"
13121312
"@rspack/cli": "npm:~1.7.2"
13131313
"@rspack/core": "npm:~1.7.2"
13141314
css-loader: "npm:^7.1.2"
@@ -1325,7 +1325,7 @@ __metadata:
13251325
languageName: unknown
13261326
linkType: soft
13271327

1328-
"@openremote/manager@npm:~1.15.2":
1328+
"@openremote/manager@npm:~1.15.1":
13291329
version: 1.15.2
13301330
resolution: "@openremote/manager@npm:1.15.2"
13311331
dependencies:
@@ -1358,7 +1358,7 @@ __metadata:
13581358
languageName: node
13591359
linkType: hard
13601360

1361-
"@openremote/model@npm:1.15.2, @openremote/model@npm:~1.15.2":
1361+
"@openremote/model@npm:1.15.2, @openremote/model@npm:~1.15.1":
13621362
version: 1.15.2
13631363
resolution: "@openremote/model@npm:1.15.2"
13641364
checksum: 10/72029adf4776ea9ef6052e7cae152214c3e9c61c6411cdb566ced3b922635842863d8395d23a76e36831c561d0852608db4a6198c23bf720311a226430b552d0
@@ -1660,7 +1660,7 @@ __metadata:
16601660
languageName: node
16611661
linkType: hard
16621662

1663-
"@openremote/or-mwc-components@npm:1.15.2, @openremote/or-mwc-components@npm:~1.15.2":
1663+
"@openremote/or-mwc-components@npm:1.15.2, @openremote/or-mwc-components@npm:~1.15.1":
16641664
version: 1.15.2
16651665
resolution: "@openremote/or-mwc-components@npm:1.15.2"
16661666
dependencies:
@@ -1778,7 +1778,7 @@ __metadata:
17781778
languageName: node
17791779
linkType: hard
17801780

1781-
"@openremote/rest@npm:1.15.2, @openremote/rest@npm:~1.15.2":
1781+
"@openremote/rest@npm:1.15.2, @openremote/rest@npm:~1.15.1":
17821782
version: 1.15.2
17831783
resolution: "@openremote/rest@npm:1.15.2"
17841784
dependencies:
@@ -1788,7 +1788,7 @@ __metadata:
17881788
languageName: node
17891789
linkType: hard
17901790

1791-
"@openremote/util@npm:^1.15.2, @openremote/util@npm:~1.15.2":
1791+
"@openremote/util@npm:^1.15.1, @openremote/util@npm:~1.15.1":
17921792
version: 1.15.2
17931793
resolution: "@openremote/util@npm:1.15.2"
17941794
bin:
@@ -4812,7 +4812,7 @@ __metadata:
48124812
version: 0.0.0-use.local
48134813
resolution: "model@workspace:ui/component/model"
48144814
dependencies:
4815-
"@openremote/util": "npm:^1.15.2"
4815+
"@openremote/util": "npm:^1.15.1"
48164816
languageName: unknown
48174817
linkType: soft
48184818

@@ -5604,8 +5604,8 @@ __metadata:
56045604
version: 0.0.0-use.local
56055605
resolution: "rest@workspace:ui/component/rest"
56065606
dependencies:
5607-
"@openremote/rest": "npm:~1.15.2"
5608-
"@openremote/util": "npm:~1.15.2"
5607+
"@openremote/rest": "npm:~1.15.1"
5608+
"@openremote/util": "npm:~1.15.1"
56095609
"@rspack/core": "npm:~1.7.2"
56105610
"@types/qs": "npm:^6.9.7"
56115611
model: "workspace:*"
@@ -5638,7 +5638,7 @@ __metadata:
56385638
version: 0.0.0-use.local
56395639
resolution: "root-workspace-0b6124@workspace:."
56405640
dependencies:
5641-
"@openremote/util": "npm:~1.15.2"
5641+
"@openremote/util": "npm:~1.15.1"
56425642
languageName: unknown
56435643
linkType: soft
56445644

0 commit comments

Comments
 (0)