Skip to content

Commit

Permalink
Merge pull request #52 from FlowCI/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
gy2006 committed Aug 18, 2021
2 parents aa2b272 + 328ec7d commit 051cb1d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand All @@ -29,7 +29,7 @@ test:
$(GOTEST_MOCK_GEN)
$(DOCKER_RUN) "$(GOTEST)"

docker: build
image: build
$(DOCKER_BUILD) $(tag)

clean:
Expand Down
2 changes: 1 addition & 1 deletion executor/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down

0 comments on commit 051cb1d

Please sign in to comment.