Skip to content

Commit

Permalink
makefile: fix up usage of --volume
Browse files Browse the repository at this point in the history
Signed-off-by: Aleksa Sarai <[email protected]>
  • Loading branch information
cyphar committed Feb 17, 2017
1 parent 0785b33 commit b47fdcc
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ all: binary docs
# Then do the build and the output (skopeo) should appear in current dir
binary: cmd/skopeo
docker build ${DOCKER_BUILD_ARGS} -f Dockerfile.build -t skopeobuildimage .
docker run --rm --security-opt label:disable -v $$(pwd):/src/github.com/projectatomic/skopeo \
docker run --rm --security-opt label:disable -v $$(pwd):/go/src/github.com/projectatomic/skopeo \
skopeobuildimage make binary-local $(if $(DEBUG),DEBUG=$(DEBUG))

binary-static: cmd/skopeo
docker build ${DOCKER_BUILD_ARGS} -f Dockerfile.build -t skopeobuildimage .
docker run --rm --security-opt label:disable -v $$(pwd):/src/github.com/projectatomic/skopeo \
docker run --rm --security-opt label:disable -v $$(pwd):/go/src/github.com/projectatomic/skopeo \
skopeobuildimage make binary-local-static $(if $(DEBUG),DEBUG=$(DEBUG))

# Build w/o using Docker containers
Expand Down Expand Up @@ -89,7 +89,7 @@ install-completions:
install -m 644 -D completions/bash/skopeo ${BASHINSTALLDIR}/skopeo

shell: build-container
$(DOCKER_RUN_DOCKER) bash
$(DOCKER_FLAGS) -v $$(pwd):/go/src/github.com/projectatomic/skopeo "$(DOCKER_IMAGE)" bash

check: validate test-unit test-integration

Expand Down

0 comments on commit b47fdcc

Please sign in to comment.