upgrade code

LincolnBruce · LincolnBruce · commit a1e97c6e49ad · 2022-08-01T19:27:34.000+08:00
diff --git a/build.sh b/build.sh
@@ -9,8 +9,8 @@ build()
   docker buildx build --platform $1 -t $2 -f $3 $4 --push
 }
 
-build linux/amd64 cubegroup/devops-shell $path/dockerfiles/shell/Dockerfile $path/dockerfiles
-build linux/amd64 cubegroup/devops-shell-java $path/dockerfiles/shell-java/Dockerfile $path/dockerfiles
+build linux/arm64,linux/amd64 cubegroup/devops-shell:$version $path/dockerfiles/shell/Dockerfile $path/dockerfiles
+build linux/arm64,linux/amd64 cubegroup/devops-shell-java:$version $path/dockerfiles/shell-java/Dockerfile $path/dockerfiles
 
 CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./bin/app
 build linux/arm64,linux/amd64 cubegroup/devops:$version $path/dockerfiles/devops/Dockerfile $path
diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
@@ -26,7 +26,7 @@ services:
     depends_on:
       - mysql
     privileged: true
-    image: cubegroup/devops-shell:v1.1
+    image: cubegroup/devops-shell
     container_name: devops
     restart: always
     ports:
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -26,7 +26,7 @@ services:
     depends_on:
       - mysql
     privileged: true
-    image: cubegroup/devops:v1.1
+    image: cubegroup/devops
     container_name: devops
     restart: always
     ports:
diff --git a/dockerfiles/shell-java/Dockerfile b/dockerfiles/shell-java/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.6-eclipse-temurin-8-alpine
+FROM --platform=linux/amd64 maven:3.8.6-eclipse-temurin-8-alpine
 #devops程序运行所需外壳环境
 USER root
 
diff --git a/dockerfiles/shell/Dockerfile b/dockerfiles/shell/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM --platform=linux/amd64 alpine:3.15
 #devops程序运行所需外壳环境
 USER root
 

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ build()`
`9`	`9`	`docker buildx build --platform $1 -t $2 -f $3 $4 --push`
`10`	`10`	`}`
`11`	`11`
`12`		`-build linux/amd64 cubegroup/devops-shell $path/dockerfiles/shell/Dockerfile $path/dockerfiles`
`13`		`-build linux/amd64 cubegroup/devops-shell-java $path/dockerfiles/shell-java/Dockerfile $path/dockerfiles`
	`12`	`+build linux/arm64,linux/amd64 cubegroup/devops-shell:$version $path/dockerfiles/shell/Dockerfile $path/dockerfiles`
	`13`	`+build linux/arm64,linux/amd64 cubegroup/devops-shell-java:$version $path/dockerfiles/shell-java/Dockerfile $path/dockerfiles`
`14`	`14`
`15`	`15`	`CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./bin/app`
`16`	`16`	`build linux/arm64,linux/amd64 cubegroup/devops:$version $path/dockerfiles/devops/Dockerfile $path`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM maven:3.8.6-eclipse-temurin-8-alpine`
	`1`	`+FROM --platform=linux/amd64 maven:3.8.6-eclipse-temurin-8-alpine`
`2`	`2`	`#devops程序运行所需外壳环境`
`3`	`3`	`USER root`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.15`
	`1`	`+FROM --platform=linux/amd64 alpine:3.15`
`2`	`2`	`#devops程序运行所需外壳环境`
`3`	`3`	`USER root`
`4`	`4`