Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Fix multi-arch swarm image

Michal Rutkacce348751fc7
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b098f9407..19bb3d498 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,7 +89,7 @@ build-deployment-manager-swarm:
# Build multi-arch images
- docker buildx build --push --platform $PLATFORM -t openremote/manager:latest manager/build/install/manager
- docker buildx build --push --platform $PLATFORM -t openremote/deployment:latest deployment
- - docker buildx build --push --platform $PLATFORM -t openremote/manager-swarm:latest -f swarm.Dockerfile manager/build/install/manager
+ - docker buildx build --push --platform $PLATFORM -t openremote/manager-swarm:latest -f manager/build/install/manager/swarm.Dockerfile manager/build/install/manager
rules:
- if: $CI_COMMIT_MESSAGE !~ /skip-build/
retry:
diff --git a/manager/swarm.Dockerfile b/manager/swarm.Dockerfile
index d5c85b0ee..4d3c593e7 100644
--- a/manager/swarm.Dockerfile
+++ b/manager/swarm.Dockerfile
@@ -1,8 +1,7 @@
# hadolint ignore=DL3007
-FROM openremote/manager:latest AS manager
-# hadolint ignore=DL3007
FROM openremote/deployment:latest AS deployment
-FROM openjdk:8-jre
+# hadolint ignore=DL3007
+FROM openremote/manager:latest
# Add git commit label must be specified at build time using --build-arg GIT_COMMIT=dadadadadad
ARG GIT_COMMIT=unknown
@@ -24,7 +23,6 @@ WORKDIR /opt/app
RUN mkdir -p /deployment/extensions
-COPY --from=manager /opt/app/lib /opt/app/lib
COPY --from=deployment /deployment/ /deployment/
# hadolint ignore=DL3025
ENTRYPOINT java $JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Main