github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-07-10 13:13:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #160 from mikebrow/make-dependencies

Browse Source 
fix dependencies
This commit is contained in:
Miloslav Trmač 2016-08-15 16:59:19 +02:00 committed by GitHub
commit cd0cef8442
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,4 +1,4 @@
.PHONY: all binary build clean install install-binary shell test-integration .PHONY: all binary build-container build-local clean install install-binary shell test-integration
export GO15VENDOREXPERIMENT=1 export GO15VENDOREXPERIMENT=1
@ -28,11 +28,9 @@ MANPAGES_MD = $(wildcard docs/*.md)
all: binary docs all: binary docs
binary: skopeo
# Build a docker image (skopeobuild) that has everything we need to build. # Build a docker image (skopeobuild) that has everything we need to build.
# Then do the build and the output (skopeo) should appear in current dir # Then do the build and the output (skopeo) should appear in current dir
skopeo: cmd/skopeo binary: cmd/skopeo
docker build ${DOCKER_BUILD_ARGS} -f Dockerfile.build -t skopeobuildimage . docker build ${DOCKER_BUILD_ARGS} -f Dockerfile.build -t skopeobuildimage .
docker run --rm -v ${PWD}:/src/github.com/projectatomic/skopeo \ docker run --rm -v ${PWD}:/src/github.com/projectatomic/skopeo \
skopeobuildimage make binary-local skopeobuildimage make binary-local
@ -57,7 +55,7 @@ install: install-binary install-docs
# TODO(runcom) # TODO(runcom)
#install -m 644 completion/bash/skopeo ${BASHINSTALLDIR}/ #install -m 644 completion/bash/skopeo ${BASHINSTALLDIR}/
install-binary: skopeo install-binary: ./skopeo
install -d -m 0755 ${INSTALLDIR} install -d -m 0755 ${INSTALLDIR}
install -m 755 skopeo ${INSTALLDIR} install -m 755 skopeo ${INSTALLDIR}