diff options
| author | cyberta <cyberta@riseup.net> | 2021-11-12 00:46:35 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-11-12 00:46:35 +0000 |
| commit | c5d722f555b952407dade3abb1ffd537e6747317 (patch) | |
| tree | a9ebb8b33438589a33ed9ce54ade50371c9fe147 /docker/android-emulator/Dockerfile | |
| parent | 571c0479f7400e56cfdb27408160d8a816cc8610 (diff) | |
| parent | 8aeb4791b6e024de9aa9c61b574d8c798a3c0a2c (diff) | |
Merge branch 'tor-snowflake' into 'master'
tor-over-snowflake
Closes #9045
See merge request leap/bitmask_android!138
Diffstat (limited to 'docker/android-emulator/Dockerfile')
| -rw-r--r-- | docker/android-emulator/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 9cd8294d..138173d4 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -15,10 +15,12 @@ ENV ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 RUN apt-get update -qq && \ apt-get -y dist-upgrade && \ apt-get -y install gnupg apt-transport-https -RUN echo 'deb https://apt.dockerproject.org/repo debian-stretch main'> /etc/apt/sources.list.d/docker.list && \ - curl -s https://apt.dockerproject.org/gpg | apt-key add - +RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \ + echo \ + "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \ + $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null RUN apt-get update -qq && \ - apt-get -y install docker-engine mesa-utils && \ + apt-get -y install docker-ce mesa-utils && \ apt-get clean && \ apt-get autoclean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* |