diff options
| author | Emīls <emils@mullvad.net> | 2021-08-17 17:53:24 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2021-08-18 15:08:18 +0100 |
| commit | 91b0d131ec91c44477852e2ac4e9cb759036f38a (patch) | |
| tree | 91874b34f2b8584d1850516d801f2caffca0608e /android | |
| parent | ce5fd274c8cfc5ecd95e0015944a95f56eb5329f (diff) | |
| download | mullvadvpn-91b0d131ec91c44477852e2ac4e9cb759036f38a.tar.xz mullvadvpn-91b0d131ec91c44477852e2ac4e9cb759036f38a.zip | |
Fix dockerfile
Change the dockerfile to stop depending on a specific rust version and
remove the dependency on nodejs. This makes the docker image buildable
for now, but the dependency on the hash of the rustup installation
script will break often anyway.
Diffstat (limited to 'android')
| -rw-r--r-- | android/docker/Dockerfile | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index cde5cc8d7e..7a46151646 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -72,17 +72,10 @@ ENV PATH="${PATH}:/root/.cargo/bin" \ RUN curl -sf -L https://sh.rustup.rs > /tmp/rustup.sh && \ cd /tmp && \ - echo "40229562d4fa60e102646644e473575bae22ff56c3a706898a47d7241c9c031e rustup.sh" | sha256sum -c && \ + echo "a3cb081f88a6789d104518b30d4aa410009cd08c3822a1226991d6cf0442a0f8 rustup.sh" | sha256sum -c && \ chmod +x rustup.sh && \ ./rustup.sh -y && \ rm rustup.sh && \ - rustc --version | grep -q '^rustc 1[.]52[.]1 ' && \ rustup target add x86_64-linux-android i686-linux-android aarch64-linux-android armv7-linux-androideabi -# Install Node.js -RUN curl -sf -L https://deb.nodesource.com/setup_12.x > /tmp/setup-nodejs.sh && \ - cd /tmp && \ - echo "b018082c06206162bb03b97cf7e9463b7e63e7d4fb1024ec9591f071a0ca7a56 setup-nodejs.sh" | sha256sum -c && \ - apt-get install -y nodejs - CMD ["./build-apk.sh", "--no-docker"] |