From 7a681b084a9d74bb8f37d93a97ded795a175a5f0 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 9 Jan 2018 13:42:15 +0100 Subject: [pkg] rename docker target it was a bit confusing before. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8dd0aeec..065e990f 100644 --- a/Makefile +++ b/Makefile @@ -86,17 +86,17 @@ bundle_in_virtualenv: bundle_in_virtualenv_osx: pkg/build_osx_bundle_with_venv.sh -docker_container: - cd pkg/docker_bundle && docker build -t mybundle . - package_in_docker: # needs docker_ce and gitlab-runner from upstream gitlab-runner exec docker package:amd64_stretch +bundler_image: + cd pkg/docker_bundle && docker build -t local_bundler . + bundle_in_docker: # needs a docker container called 'mybundle', created with 'make docker_container' rm -rf $(DIST_VERSION) bitmaskbuild - cat pkg/docker_build | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" mybundle bash + cat pkg/docker_build | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" local_bundler bash mkdir -p dist/ cp -r bitmaskbuild/$(DIST_VERSION) dist/ rm -rf bitmaskbuild -- cgit v1.2.3