summaryrefslogtreecommitdiff
path: root/tests/docker
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-05-04 19:49:01 -0400
committerMicah Anderson <micah@riseup.net>2017-05-04 20:13:01 -0400
commit0ab8bda086ec2953a644265a6a0d7af400b37a7d (patch)
treec32367d7c4e841b11c49873413325c12d253d395 /tests/docker
parent571cf88bf855dae527628f5b6379c7d1f3dcdba8 (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.
Diffstat (limited to 'tests/docker')
-rw-r--r--tests/docker/Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
index 2be124e..38936e6 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