diff options
| author | Kali Kaneko <kali@leap.se> | 2018-02-12 19:15:16 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-02-15 16:36:43 +0100 |
| commit | 91f2b6d8e06de864cd6f43d06b5581ec101f94ff (patch) | |
| tree | c47dc977b5caa22beb0b33a21edd1e06bc488103 | |
| parent | 03e4bae0942c58344d6021fdaa08342baa7aea3c (diff) | |
[pkg] rename bundler image
| -rw-r--r-- | pkg/docker_bundle/Makefile | 6 | ||||
| -rw-r--r-- | pkg/docker_bundleapt/Makefile | 16 |
2 files changed, 14 insertions, 8 deletions
diff --git a/pkg/docker_bundle/Makefile b/pkg/docker_bundle/Makefile index 0d6ce9fc..f9c82ac1 100644 --- a/pkg/docker_bundle/Makefile +++ b/pkg/docker_bundle/Makefile @@ -1,6 +1,8 @@ +IMAGE=bitmask-bundler + build: - docker build -t 0xacab.org:4567/leap/docker/bitmask-bundler:latest . + docker build -t 0xacab.org:4567/leap/docker/$(IMAGE):latest . push: - docker push 0xacab.org:4567/leap/docker/bitmask-bundler:latest + docker push 0xacab.org:4567/leap/docker/$(IMAGE):latest login: docker login 0xacab.org:4567 diff --git a/pkg/docker_bundleapt/Makefile b/pkg/docker_bundleapt/Makefile index a9eaa7c7..e68a9cf5 100644 --- a/pkg/docker_bundleapt/Makefile +++ b/pkg/docker_bundleapt/Makefile @@ -1,16 +1,20 @@ +IMAGE=bitmask-bundler-apt + +# for leap registry + build: - docker build -t 0xacab.org:4567/leap/docker/bitmask-bundler:latest . + docker build -t 0xacab.org:4567/leap/docker/$(IMAGE):latest . push: - docker push 0xacab.org:4567/leap/docker/bitmask-bundler:latest + docker push 0xacab.org:4567/leap/docker/$(IMAGE):latest login: docker login 0xacab.org:4567 -# local tests +# for local tests bundler: - docker build -t bundler . + docker build -t $(IMAGE) . shell: - docker run -i -t bundler bash + docker run -i -t $(IMAGE) bash bundle: - echo "cd /src/leap/bitmask-dev && VIRTUAL_ENV=/usr/local make bundle && cp -r dist/* /dist" | docker run -i -v /srv/bitmask-builds:/dist -w /dist bundler bash + echo "cd /src/leap/bitmask-dev && VIRTUAL_ENV=/usr/local make bundle && cp -r dist/* /dist" | docker run -i -v /srv/bitmask-builds:/dist -w /dist $(IMAGE) bash |