Merge pull request #52 from FlowCI/develop

gy2006 · web-flow · commit 051cb1db0b78 · 2021-08-18T22:32:09.000+02:00
Develop
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ DOCKER_RUN 		:= docker run -it --rm -v $(CURRENT_DIR):/ws $(GOENV) -w /ws --netw
 
 DOCKER_BUILD 	:= ./build.sh
 
-.PHONY: build protogen test docker clean cleanall
+.PHONY: build protogen test image clean cleanall
 
 build:
 	$(DOCKER_RUN) "$(GOGEN) && $(GOBUILD_LINUX) && $(GOBUILD_MAC) && $(GOBUILD_WIN)"
@@ -29,7 +29,7 @@ test:
 	$(GOTEST_MOCK_GEN)
 	$(DOCKER_RUN) "$(GOTEST)"
 
-docker: build
+image: build
 	$(DOCKER_BUILD) $(tag)
 
 clean:
diff --git a/executor/docker.go b/executor/docker.go
@@ -439,7 +439,7 @@ func (d *dockerExecutor) pullImageWithName(image string, auth *domain.SimpleAuth
 	fullRef := image
 
 	if isDockerHubImage(image) {
-		fullRef = image
+		fullRef = "docker.io/library/" + image
 		if strings.Contains(image, "/") {
 			fullRef = "docker.io/" + image
 		}

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ func (d dockerExecutor) pullImageWithName(image string, auth domain.SimpleAuth`
`439`	`439`	`fullRef := image`
`440`	`440`
`441`	`441`	`if isDockerHubImage(image) {`
`442`		`- fullRef = image`
	`442`	`+ fullRef = "docker.io/library/" + image`
`443`	`443`	`if strings.Contains(image, "/") {`
`444`	`444`	`fullRef = "docker.io/" + image`
`445`	`445`	`}`