Skip to content

Commit

Permalink
Merge pull request #3569 from justinsb/makefile_fix_dirperms
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Makefile: fix order of directory creation
  • Loading branch information
Kubernetes Submit Queue authored Oct 9, 2017
2 parents 8852afd + cc22322 commit 988fcf1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ protokube-builder-image:

.PHONY: protokube-build-in-docker
protokube-build-in-docker: protokube-builder-image
mkdir -p ${IMAGES} # We have to create the directory first, so docker doesn't mess up the ownership of the dir
docker run -t -e VERSION=${VERSION} -e HOST_UID=${UID} -e HOST_GID=${GID} -v `pwd`:/src protokube-builder /onbuild.sh

.PHONY: protokube-image
Expand All @@ -360,7 +361,6 @@ protokube-image: protokube-build-in-docker

.PHONY: protokube-export
protokube-export: protokube-image
mkdir -p ${IMAGES}
docker save protokube:${PROTOKUBE_TAG} > ${IMAGES}/protokube.tar
gzip --force --best ${IMAGES}/protokube.tar
(${SHASUMCMD} ${IMAGES}/protokube.tar.gz | cut -d' ' -f1) > ${IMAGES}/protokube.tar.gz.sha1
Expand Down

0 comments on commit 988fcf1

Please sign in to comment.