docker build追加--pull

Author: LincolnBruce

build.sh

@@ -9,8 +9,8 @@ build()
   docker buildx build --platform $1 -t $2 -f $3 $4 --push
 }
 
-build linux/arm64,linux/amd64 cubegroup/devops-shell $path/dockerfiles/shell/Dockerfile $path/dockerfiles
-build linux/arm64,linux/amd64 cubegroup/devops-shell-java $path/dockerfiles/shell-java/Dockerfile $path/dockerfiles
+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
 
 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

dockerfiles/shell-java/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 maven:3.8.6-eclipse-temurin-8-alpine
+FROM maven:3.8.6-eclipse-temurin-8-alpine
 #devops程序运行所需外壳环境
 USER root
 

dockerfiles/shell/Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 alpine:3.15
+FROM alpine:3.15
 #devops程序运行所需外壳环境
 USER root
 

models/history.go

@@ -396,33 +396,31 @@ func (t *History) createRunDockerMode() (runContent string, err error) {
 		imageName = t.Project.Docker.Image
 	} else if template.Dockerfile != "" { //create newLines
 		var dockerfileLines = make([]string, 0)
-		var fromImage string
+		//var fromImage string
 		for _, v := range strings.Split(template.Dockerfile, "\n") {
 			v = strings.TrimLeft(v, " ")
 			v = strings.TrimRight(v, " ")
 			if strings.Contains(v, "FROM ") {
-				fromImage = strings.Split(v, "FROM ")[1]
+				//fromImage = strings.Split(v, "FROM ")[1]
 				v = fmt.Sprintf("%s\n%s", v, strings.Join(volumeLines, "\n"))
 			}
 			dockerfileLines = append(dockerfileLines, v)
 		}
-		if fromImage == "" {
-			err = errors.New("Dockerfile invalid")
-			return
-		}
+		//if fromImage == "" {
+		//	err = errors.New("Dockerfile invalid")
+		//	return
+		//}
 		//create dockerfile
 		if err = ioutil.WriteFile(t.WorkspaceDockerfile(), []byte(strings.Join(dockerfileLines, "\n")), os.ModePerm); err != nil {
 			return
 		}
 		imageName = t.ImageURL()
 		dockerBuild = fmt.Sprintf(`
 docker login %s --username=%s --password=%s
-docker pull %s
-docker build --platform=linux/amd64 -t %s %s
+docker build --pull --platform=linux/amd64 -t %s %s
 docker push %s
 `,
 			_cfg.RegistryHost, _cfg.RegistryUsername, _cfg.RegistryPassword,
-			fromImage,
 			imageName, t.Workspace(),
 			imageName,
 		)