diff options
| author | Kali Kaneko <kali@leap.se> | 2018-01-09 13:42:15 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-01-09 17:49:09 +0100 |
| commit | 7a681b084a9d74bb8f37d93a97ded795a175a5f0 (patch) | |
| tree | eca91bb662caa7e4cd83523c023b92547a62e84a | |
| parent | 7df7d3f469be74d201b5b50eea515575d223b6e0 (diff) | |
[pkg] rename docker target
it was a bit confusing before.
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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 |