diff options
| author | Joshua Björkäng <joshua@mullvad.net> | 2020-11-05 16:31:00 +0100 |
|---|---|---|
| committer | Joshua Björkäng <joshua@mullvad.net> | 2020-11-05 16:31:00 +0100 |
| commit | 9a1e6088db0cda0de1d6eb780275f96eb04ab415 (patch) | |
| tree | 98602fb38b38a573b74e0e7e637555f447fb4ddc | |
| parent | 1bae087897ebcb0b7943562332626a6e66257e57 (diff) | |
| download | mullvadvpn-9a1e6088db0cda0de1d6eb780275f96eb04ab415.tar.xz mullvadvpn-9a1e6088db0cda0de1d6eb780275f96eb04ab415.zip | |
Move Docker images to Quay.io
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rwxr-xr-x | wireguard/build-wireguard-go.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 7654f4945a..c6977b4f90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,7 +110,7 @@ matrix: # --privileged is required because nightly cargo uses statx instead of stat, and that # syscall is so new that it's not on the docker whitelist yet. # https://github.com/rust-lang/rust/issues/65662 - - docker run -d --privileged --name mvd-build -v $(pwd):/travis -w /travis mullvadvpn/mullvadvpn-app-build:latest tail -f /dev/null + - docker run -d --privileged --name mvd-build -v $(pwd):/travis -w /travis quay.io/mullvad/mullvadvpn-app-build:latest tail -f /dev/null - docker ps script: - docker exec -t mvd-build bash ci/ci-rust-script.sh nightly diff --git a/Dockerfile b/Dockerfile index 12409f8297..23691905ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # To build the image: -# docker build . -t mullvadvpn/mullvadvpn-app-build -# To push the image to our docker hub: -# docker push mullvadvpn/mullvadvpn-app-build +# docker build . -t quay.io/mullvad/mullvadvpn-app-build +# To push the image to Quay.io: +# docker push quay.io/mullvad/mullvadvpn-app-build FROM debian:stable@sha256:75f7d0590b45561bfa443abad0b3e0f86e2811b1fc176f786cd30eb078d1846f RUN apt update -y RUN apt install build-essential \ diff --git a/wireguard/build-wireguard-go.sh b/wireguard/build-wireguard-go.sh index 50a948a72b..5b1cb3f0ce 100755 --- a/wireguard/build-wireguard-go.sh +++ b/wireguard/build-wireguard-go.sh @@ -97,7 +97,7 @@ function build_android { docker run --rm \ -v "$(pwd)/../":/workspace \ --entrypoint "/workspace/wireguard/libwg/build-android.sh" \ - mullvadvpn/mullvad-android-app-build@sha256:$docker_image_hash + quay.io/mullvad/mullvad-android-app-build@sha256:$docker_image_hash else ./libwg/build-android.sh fi |