Update docker-compose for easier versioned deployment

pankalog · pankalog · commit 529c2984ef17 · 2024-10-07T12:46:28.000+02:00
diff --git a/build_and_publish_to_docker.sh b/build_and_publish_to_docker.sh
@@ -3,6 +3,6 @@
 GIT_DEPLOYMENT_VERSION=$(git rev-parse --short HEAD)
 docker login
 docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder
-docker buildx build --platform linux/amd64,linux/arm64 -t pankalog/fleet-deployment:"$GIT_DEPLOYMENT_VERSION" --builder multi-platform-builder  ./deployment/build/
-docker buildx build --platform linux/amd64,linux/arm64 -t pankalog/fleet-management:"$GIT_DEPLOYMENT_VERSION" --builder multi-platform-builder  ./openremote/manager/build/install/manager/
-docker-compose -p fleet-management up -d
+docker buildx build --load --platform linux/amd64,linux/arm64 -t pankalog/fleet-deployment:"$GIT_DEPLOYMENT_VERSION" --builder multi-platform-builder  ./deployment/build/
+docker buildx build --load --platform linux/amd64,linux/arm64 -t pankalog/fleet-management:"$GIT_DEPLOYMENT_VERSION" --builder multi-platform-builder  ./openremote/manager/build/install/manager/
+DEPLOYMENT_VERSION="$GIT_DEPLOYMENT_VERSION" docker-compose -p fleet-management up -d
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -108,7 +108,7 @@ services:
 #    <<: *awslogs
 
   manager:
-    image: pankalog/fleet-management:${MANAGER_VERSION:-latest}
+    image: pankalog/fleet-management:${DEPLOYMENT_VERSION:-latest}
     restart: always
     depends_on:
       keycloak:
