diff options
| author | Kali Kaneko <kali@leap.se> | 2018-01-08 14:40:56 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-01-09 00:30:28 +0100 |
| commit | 7df7d3f469be74d201b5b50eea515575d223b6e0 (patch) | |
| tree | 04a5bdb9fd9cd38b8eb1a6a05aef5671a6a25c8e | |
| parent | 7077a5ff7a80a0c36525e027ec1e58680d008a50 (diff) | |
[pkg] use bitmask-bundler image for bundles
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | pkg/docker_bundle/Dockerfile | 14 | ||||
| -rw-r--r-- | tests/docker/Dockerfile | 10 |
3 files changed, 16 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4894d80f..d9690ecb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ osx_test: - osx bitmask_latest_bundle: - image: 0xacab.org:4567/leap/bitmask-dev:latest + image: 0xacab.org:4567/leap/docker/bitmask-bundler:latest stage: publish script: - pkg/build_bundle_with_venv.sh @@ -166,7 +166,7 @@ build_docker_image: fi build_docker_bundle_image: - image: 0xacab.org:4567/leap/bitmask-bundler:latest + image: 0xacab.org:4567/leap/docker/bitmask-bundler:latest stage: publish services: - docker:dind diff --git a/pkg/docker_bundle/Dockerfile b/pkg/docker_bundle/Dockerfile index 5c3797d3..90ad6eb3 100644 --- a/pkg/docker_bundle/Dockerfile +++ b/pkg/docker_bundle/Dockerfile @@ -4,15 +4,17 @@ # It has diverged from the original, but it's because I don't want the clutter # of all the nodejs and friends inside a container for bundling -- kali. -FROM ubuntu:16.04 +FROM ubuntu:17.04 MAINTAINER LEAP Encryption Access Project <info@leap.se> -LABEL Description="Image for building Bitmask bundle based on Ubuntu 16:04" Vendor="LEAP" Version="1.0" +LABEL Description="Image for building Bitmask bundle based on Ubuntu 17:04" Vendor="LEAP" Version="1.1" RUN apt update && apt upgrade -y # Install bitmask-dev build deps -RUN apt install -y git build-essential python-virtualenv libpython-dev \ - libsqlcipher-dev libssl-dev libffi-dev python-pyqt5 python-pyqt5.qtwebkit \ - libusb-0.1-4 patchelf wget - +RUN apt install -y --no-install-recommends \ + build-essential virtualenv libpython-dev \ + libsqlcipher-dev libssl-dev libffi-dev \ + python-pyqt5 python-pyqt5.qtwebengine \ + libusb-0.1-4 patchelf wget \ + git diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 294b3305..51ce3149 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -1,18 +1,20 @@ FROM 0xacab.org:4567/leap/docker/ubuntu:artful_amd64 -MAINTAINER LEAP Encryption Access Project <info@leap.se> LABEL Description="Image for building bitmask-dev based on Ubuntu 17:10" Vendor="LEAP" Version="1.0" +MAINTAINER LEAP Encryption Access Project <info@leap.se> # Install bitmask-dev build and test deps RUN apt-get update && \ apt-get -y install --no-install-recommends \ - build-essential tox libpython-dev \ + build-essential python-virtualenv libpython-dev \ libsqlcipher-dev libssl-dev libffi-dev \ python-pyqt5 python-pyqt5.qtwebengine \ + libusb-0.1-4 patchelf wget \ + git \ + tox \ nodejs npm mocha \ - git swaks uuid-runtime \ + swaks uuid-runtime \ openvpn policykit-1 lxpolkit \ - wget patchelf libusb-0.1-4 \ xvfb gnupg1 haveged \ # needed for chromedriver libgconf-2-4 chromium-browser unzip |