diff options
| author | Micah Anderson <micah@riseup.net> | 2017-05-04 19:49:01 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-05-04 20:13:01 -0400 |
| commit | 0ab8bda086ec2953a644265a6a0d7af400b37a7d (patch) | |
| tree | c32367d7c4e841b11c49873413325c12d253d395 | |
| parent | 571cf88bf855dae527628f5b6379c7d1f3dcdba8 (diff) | |
[feat] Create and publish docker image (see #8755).
When the tests/docker directory is changed, this CI job is triggered to
build the docker image and push it to the bitmask-dev container
registry.
This allows us to change the existing CI jobs to pull the image from our
registry, instead of from dockerhub.
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | tests/docker/Dockerfile | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 351c0ca0..2ac0985e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ osx_test: - osx bitmask_latest_bundle: - image: leapcode/bitmask-dev:latest + image: 0xacab.org:4567/leap/bitmask-dev:latest stage: bundle script: pkg/build_bundle_with_venv.sh artifacts: @@ -36,7 +36,7 @@ bitmask_latest_bundle: - linux build_ui: - image: leapcode/bitmask-dev:latest + image: 0xacab.org:4567/leap/bitmask-dev:latest stage: build script: - cd ui && make dev-build @@ -44,7 +44,7 @@ build_ui: - linux e2e_tests: - image: leapcode/bitmask-dev:latest + image: 0xacab.org:4567/leap/bitmask-dev:latest stage: e2e allow_failure: true script: @@ -58,7 +58,7 @@ e2e_tests: - linux build_docker_image: - image: 0xacab.org:4567/micah/bitmask-dev:latest + image: 0xacab.org:4567/leap/bitmask-dev:latest stage: test services: - docker:dind @@ -66,7 +66,7 @@ build_docker_image: - docker-in-docker before_script: - > - export LAST_COMMIT=$(curl --header "PRIVATE-TOKEN: $CI_JOB_TOKEN" ${CI_PROJECT_URL}/pipelines | + export LAST_COMMIT=$(curl -s --header "PRIVATE-TOKEN: ${LEAP_CODE_O_MATIC_PRIVATE_TOKEN}" https://0xacab.org/api/v4/projects/574/pipelines | python -c "import sys, json; print json.load(sys.stdin)[1]['sha']") script: - > diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile index 2be124e8..38936e62 100644 --- a/tests/docker/Dockerfile +++ b/tests/docker/Dockerfile @@ -1,6 +1,6 @@ # start with a fresh official ruby image # https://hub.docker.com/_/ruby/ -FROM ubuntu:16.04 +FROM 0xacab.org:4567/leap/bitmask-dev:latest MAINTAINER LEAP Encryption Access Project <info@leap.se> LABEL Description="Image for building bitmask-dev based on Ubuntu 16:04" Vendor="LEAP" Version="1.0" @@ -11,4 +11,4 @@ RUN apt-get update RUN apt-get -y install build-essential python-virtualenv libpython-dev \ libsqlcipher-dev libssl-dev libffi-dev python-pyqt5 python-pyqt5.qtwebkit \ nodejs npm nodejs-legacy git swaks uuid-runtime \ - patchelf libusb-0.1-4 + patchelf libusb-0.1-4 docker.io |