Merge pull request #46 from daimor/master

evshvarov · web-flow · commit 8291dc406f81 · 2024-12-18T10:11:14.000Z
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN \
   iris session $ISC_PACKAGE_INSTANCENAME -U %SYS < /tmp/iris.script && \
   iris stop $ISC_PACKAGE_INSTANCENAME quietly
 
-FROM --platform=$TARGETPLATFORM intersystems/iris-community:2024.1-linux-${BUILDARCH}
+FROM --platform=$TARGETPLATFORM intersystems/iris-community:2024.1-linux-${TARGETARCH}
 
 USER root
 
diff --git a/Dockerfile-amd64 b/Dockerfile-amd64
@@ -1,4 +1,5 @@
 # syntax = edrevo/dockerfile-plus
+ARG IMAGE=containers.intersystems.com/intersystems/iris-community:latest-cd
 
 INCLUDE+ Dockerfile-phase1
 
diff --git a/Dockerfile-arm64 b/Dockerfile-arm64
@@ -1,4 +1,5 @@
 # syntax = edrevo/dockerfile-plus
+ARG IMAGEARM=containers.intersystems.com/intersystems/iris-community:latest-cd
 
 INCLUDE+ Dockerfile-phase1
 
diff --git a/Dockerfile-phase1 b/Dockerfile-phase1
@@ -1,6 +1,6 @@
 ARG IMAGE=intersystems/iris-community:latest-cd
 ARG DEV=0
-FROM $IMAGE
+FROM --platform=${BUILDPLATFORM} $IMAGE
 
 ARG IPM_INSTALLER=https://pm.community.intersystems.com/packages/zpm/latest/installer
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# syntax = edrevo/dockerfile-plus`
	`2`	`+ARG IMAGE=containers.intersystems.com/intersystems/iris-community:latest-cd`
`2`	`3`
`3`	`4`	`INCLUDE+ Dockerfile-phase1`
`4`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# syntax = edrevo/dockerfile-plus`
	`2`	`+ARG IMAGEARM=containers.intersystems.com/intersystems/iris-community:latest-cd`
`2`	`3`
`3`	`4`	`INCLUDE+ Dockerfile-phase1`
`4`	`5`