Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Commit ed13438

Browse files
committed
Remove old || true hack in Makefile
The issue was resolved back before docker 1.0.
1 parent 8fdc6f5 commit ed13438

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ default: dockerbuild
1212
@true # stop from matching "%" later
1313

1414

15-
# Build binaries in Docker container. The `|| true` hack is a temporary fix for
16-
# https://github.com/dotcloud/docker/issues/3986
15+
# Build binaries in Docker container.
1716
dockerbuild: clean
1817
docker build -t "$(DOCKER_IMAGE)" .
1918
docker run --name "$(DOCKER_CONTAINER)" "$(DOCKER_IMAGE)"
20-
docker cp "$(DOCKER_CONTAINER)":"$(DOCKER_SRC_PATH)"/$(PREFIX)-$(VERSION)-darwin-$(GOARCH) . || true
21-
docker cp "$(DOCKER_CONTAINER)":"$(DOCKER_SRC_PATH)"/$(PREFIX)-$(VERSION)-linux-$(GOARCH) . || true
22-
docker cp "$(DOCKER_CONTAINER)":"$(DOCKER_SRC_PATH)"/$(PREFIX)-$(VERSION)-windows-$(GOARCH).exe . || true
19+
docker cp "$(DOCKER_CONTAINER)":"$(DOCKER_SRC_PATH)"/$(PREFIX)-$(VERSION)-darwin-$(GOARCH) .
20+
docker cp "$(DOCKER_CONTAINER)":"$(DOCKER_SRC_PATH)"/$(PREFIX)-$(VERSION)-linux-$(GOARCH) .
21+
docker cp "$(DOCKER_CONTAINER)":"$(DOCKER_SRC_PATH)"/$(PREFIX)-$(VERSION)-windows-$(GOARCH).exe .
2322
docker rm "$(DOCKER_CONTAINER)"
2423

2524

0 commit comments

Comments
 (0)