make sure docker builds are made for the correct platform

reggeenr · smoser-ibm · commit d47bafa2c353 · 2023-10-18T18:28:12.000+02:00
diff --git a/app-n-job/build b/app-n-job/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/app-n-job .
+docker build ${NOCACHE} -t ${REGISTRY}/app-n-job . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/app-n-job
diff --git a/app2job/build b/app2job/build
@@ -13,9 +13,9 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build the app's image and push it
-docker build ${NOCACHE} -t ${REGISTRY}/a2j-app -f Dockerfile.app .
+docker build ${NOCACHE} -t ${REGISTRY}/a2j-app -f Dockerfile.app . --platform linux/amd64
 docker push ${REGISTRY}/a2j-app
 
 # Now build the job's
-docker build ${NOCACHE} -t ${REGISTRY}/a2j-job -f Dockerfile.job .
+docker build ${NOCACHE} -t ${REGISTRY}/a2j-job -f Dockerfile.job . --platform linux/amd64
 docker push ${REGISTRY}/a2j-job
diff --git a/auth/build b/auth/build
@@ -13,8 +13,8 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the images
-docker build ${NOCACHE} -f Dockerfile.nginx -t ${REGISTRY}/auth-proxy .
-docker build ${NOCACHE} -f Dockerfile.app -t ${REGISTRY}/auth-app .
+docker build ${NOCACHE} -f Dockerfile.nginx -t ${REGISTRY}/auth-proxy . --platform linux/amd64
+docker build ${NOCACHE} -f Dockerfile.app -t ${REGISTRY}/auth-app . --platform linux/amd64
 
 # And push them
 docker push ${REGISTRY}/auth-proxy
diff --git a/bash/build b/bash/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/ce-bash .
+docker build ${NOCACHE} -t ${REGISTRY}/ce-bash . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/ce-bash
diff --git a/bin/build-tester b/bin/build-tester
@@ -3,7 +3,7 @@
 set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
-docker build -f - -t ${REGISTRY}/ce-tester . <<-EOF
+docker build --platform linux/amd64 -f - -t ${REGISTRY}/ce-tester . <<-EOF
 	FROM icr.io/codeengine/ce-bash
 	WORKDIR /root
 	COPY tester /
diff --git a/bind-app/build b/bind-app/build
@@ -13,5 +13,5 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build the app's image and push it
-docker build ${NOCACHE} -t ${REGISTRY}/bind-app -f Dockerfile .
+docker build ${NOCACHE} -t ${REGISTRY}/bind-app -f Dockerfile . --platform linux/amd64
 docker push ${REGISTRY}/bind-app
diff --git a/bind-job/build b/bind-job/build
@@ -13,5 +13,5 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build the app's image and push it
-docker build ${NOCACHE} -t ${REGISTRY}/bind-job -f Dockerfile .
+docker build ${NOCACHE} -t ${REGISTRY}/bind-job -f Dockerfile . --platform linux/amd64
 docker push ${REGISTRY}/bind-job
diff --git a/cecli/build b/cecli/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/cecli .
+docker build ${NOCACHE} -t ${REGISTRY}/cecli . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/cecli
diff --git a/configmaps-env/build b/configmaps-env/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/ce-config-env .
+docker build ${NOCACHE} -t ${REGISTRY}/ce-config-env . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/ce-config-env
diff --git a/configmaps-vol/build b/configmaps-vol/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/ce-config-vol .
+docker build ${NOCACHE} -t ${REGISTRY}/ce-config-vol . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/ce-config-vol
diff --git a/cos-event/build b/cos-event/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/cos-listen .
+docker build ${NOCACHE} -t ${REGISTRY}/cos-listen . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/cos-listen
diff --git a/cos2cos/build b/cos2cos/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/cos2cos .
+docker build ${NOCACHE} -t ${REGISTRY}/cos2cos . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/cos2cos
diff --git a/cron/build b/cron/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/cron .
+docker build ${NOCACHE} -t ${REGISTRY}/cron . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/cron
diff --git a/cronjob/build b/cronjob/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/cronjob .
+docker build ${NOCACHE} -t ${REGISTRY}/cronjob . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/cronjob
diff --git a/daemonjob/build b/daemonjob/build
@@ -13,5 +13,5 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the job image and push it
-docker build ${NOCACHE} -t ${REGISTRY}/daemonjob -f Dockerfile .
+docker build ${NOCACHE} -t ${REGISTRY}/daemonjob -f Dockerfile . --platform linux/amd64
 docker push ${REGISTRY}/daemonjob
diff --git a/hello/Dockerfile b/hello/Dockerfile
@@ -1,4 +1,4 @@
-FROM icr.io/codeengine/node:12-alpine
+FROM icr.io/codeengine/node:18-alpine
 RUN npm install
 COPY server.js .
 EXPOSE 8080
diff --git a/hello/build b/hello/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/hello .
+docker build ${NOCACHE} -t ${REGISTRY}/hello . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/hello
diff --git a/helloworld/build b/helloworld/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/helloworld .
+docker build ${NOCACHE} -t ${REGISTRY}/helloworld . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/helloworld
diff --git a/job/build b/job/build
@@ -13,5 +13,5 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the job image and push it
-docker build ${NOCACHE} -t ${REGISTRY}/firstjob -f Dockerfile .
+docker build ${NOCACHE} -t ${REGISTRY}/firstjob -f Dockerfile . --platform linux/amd64
 docker push ${REGISTRY}/firstjob
diff --git a/job2app/build b/job2app/build
@@ -13,9 +13,9 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build the app's image and push it
-docker build ${NOCACHE} -t ${REGISTRY}/j2a-app -f Dockerfile.app .
+docker build ${NOCACHE} -t ${REGISTRY}/j2a-app -f Dockerfile.app . --platform linux/amd64
 docker push ${REGISTRY}/j2a-app
 
 # Now build the job's
-docker build ${NOCACHE} -t ${REGISTRY}/j2a-job -f Dockerfile .
+docker build ${NOCACHE} -t ${REGISTRY}/j2a-job -f Dockerfile . --platform linux/amd64
 docker push ${REGISTRY}/j2a-job
diff --git a/job2vsi/build b/job2vsi/build
@@ -13,5 +13,5 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the job image and push it
-docker build -t "${REGISTRY}"/job2vsi -f Dockerfile .
+docker build -t "${REGISTRY}"/job2vsi -f Dockerfile . --platform linux/amd64
 docker push "${REGISTRY}"/job2vsi
diff --git a/kafka/build b/kafka/build
@@ -13,8 +13,8 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the images
-docker build ${NOCACHE} -f Dockerfile.sender -t ${REGISTRY}/kafka-sender .
-docker build ${NOCACHE} -f Dockerfile.receiver -t ${REGISTRY}/kafka-receiver .
+docker build ${NOCACHE} -f Dockerfile.sender -t ${REGISTRY}/kafka-sender . --platform linux/amd64
+docker build ${NOCACHE} -f Dockerfile.receiver -t ${REGISTRY}/kafka-receiver . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/kafka-sender
diff --git a/private/build b/private/build
@@ -13,8 +13,8 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/priv-front -f Dockerfile.frontend .
-docker build ${NOCACHE} -t ${REGISTRY}/priv-back -f Dockerfile.backend .
+docker build ${NOCACHE} -t ${REGISTRY}/priv-front -f Dockerfile.frontend . --platform linux/amd64
+docker build ${NOCACHE} -t ${REGISTRY}/priv-back -f Dockerfile.backend . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/priv-front
diff --git a/secrets-env/build b/secrets-env/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/ce-secret-env .
+docker build ${NOCACHE} -t ${REGISTRY}/ce-secret-env . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/ce-secret-env
diff --git a/secrets-vol/build b/secrets-vol/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/ce-secret-vol .
+docker build ${NOCACHE} -t ${REGISTRY}/ce-secret-vol . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/ce-secret-vol
diff --git a/sessions/build b/sessions/build
@@ -13,7 +13,7 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the image
-docker build ${NOCACHE} -t ${REGISTRY}/sessions .
+docker build ${NOCACHE} -t ${REGISTRY}/sessions . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/sessions
diff --git a/testjob/build b/testjob/build
@@ -13,5 +13,5 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the job image and push it
-docker build ${NOCACHE} -t ${REGISTRY}/testjob -f Dockerfile .
+docker build ${NOCACHE} -t ${REGISTRY}/testjob -f Dockerfile . --platform linux/amd64
 docker push ${REGISTRY}/testjob
diff --git a/thumbnail/build b/thumbnail/build
@@ -14,14 +14,14 @@ export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # First build and push v1 of our app - notice no tag on the image name
 cd v1
-docker build ${NOCACHE} -t ${REGISTRY}/thumbnail .
+docker build ${NOCACHE} -t ${REGISTRY}/thumbnail . --platform linux/amd64
 docker push ${REGISTRY}/thumbnail:latest
 cd ..
 
 # Now build and push v2, but we have an app and a job this time
 cd v2
-docker build ${NOCACHE} -t ${REGISTRY}/thumbnail:v2 -f Dockerfile.app .
-docker build ${NOCACHE} -t ${REGISTRY}/thumbnail-job -f Dockerfile.job .
+docker build ${NOCACHE} -t ${REGISTRY}/thumbnail:v2 -f Dockerfile.app . --platform linux/amd64
+docker build ${NOCACHE} -t ${REGISTRY}/thumbnail-job -f Dockerfile.job . --platform linux/amd64
 docker push ${REGISTRY}/thumbnail:v2
 docker push ${REGISTRY}/thumbnail-job
 cd ..
diff --git a/websocket/build b/websocket/build
@@ -13,8 +13,8 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Build the images
-docker build -f Dockerfile.server ${NOCACHE} -t ${REGISTRY}/ws-server .
-docker build -f Dockerfile.client ${NOCACHE} -t ${REGISTRY}/ws-client .
+docker build -f Dockerfile.server ${NOCACHE} -t ${REGISTRY}/ws-server . --platform linux/amd64
+docker build -f Dockerfile.client ${NOCACHE} -t ${REGISTRY}/ws-client . --platform linux/amd64
 
 # And push it
 docker push ${REGISTRY}/ws-server

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM icr.io/codeengine/node:12-alpine`
	`1`	`+FROM icr.io/codeengine/node:18-alpine`
`2`	`2`	`RUN npm install`
`3`	`3`	`COPY server.js .`
`4`	`4`	`EXPOSE 8080`