diff options
| author | cyberta <cyberta@riseup.net> | 2026-03-14 12:13:54 +0100 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2026-03-16 11:08:57 +0000 |
| commit | 67df141dca7f46ce407734cae7d057487b31a89b (patch) | |
| tree | 3fecb00eb4ceb755751331164ea8f8c5a4c4791d /docker | |
| parent | 951869f108025c520cbeee26f9a570a81b405384 (diff) | |
fix deprectated ENV syntax in docker files
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/android-ndk/Dockerfile | 14 | ||||
| -rw-r--r-- | docker/android-sdk/Dockerfile | 11 |
2 files changed, 12 insertions, 13 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile index 6a4e8fd8..439f0d26 100644 --- a/docker/android-ndk/Dockerfile +++ b/docker/android-ndk/Dockerfile @@ -4,7 +4,7 @@ LABEL Author="LEAP Encryption Access Project <info@leap.se>" LABEL Description="Android NDK image based on android-sdk baseimage" Vendor="LEAP" Version="r28c" # Make sure debconf doesn't complain about lack of interactivity -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # ------------------------------------------------------ # --- Install System Dependencies @@ -32,10 +32,10 @@ RUN apt-get update -qq && \ # ------------------------------------------------------ # --- Install Android NDK (for running C code) -ENV ANDROID_NDK_VERSION "r28c" -ENV ANDROID_NDK_VERSION_NUMBER "28.2.13676358" -ENV ANDROID_NDK_URL http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux.zip -ENV ANDROID_SDK_ROOT ${ANDROID_HOME}/latest/cmdline-tools +ENV ANDROID_NDK_VERSION="r28c" +ENV ANDROID_NDK_VERSION_NUMBER="28.2.13676358" +ENV ANDROID_NDK_URL="http://dl.google.com/android/repository/android-ndk-${ANDROID_NDK_VERSION}-linux.zip" +ENV ANDROID_SDK_ROOT="${ANDROID_HOME}/latest/cmdline-tools" RUN echo $JAVA_HOME RUN java --version @@ -46,8 +46,8 @@ RUN curl -L $ANDROID_NDK_URL -o ndk.zip \ && rm -rf ndk.zip \ && mv $ANDROID_HOME/ndk/android-ndk-${ANDROID_NDK_VERSION}/ $ANDROID_HOME/ndk/$ANDROID_NDK_VERSION_NUMBER -ENV ANDROID_NDK_HOME ${ANDROID_HOME}/ndk/$ANDROID_NDK_VERSION_NUMBER -ENV PATH ${PATH}:${ANDROID_NDK_HOME} +ENV ANDROID_NDK_HOME=${ANDROID_HOME}/ndk/$ANDROID_NDK_VERSION_NUMBER +ENV PATH=${PATH}:${ANDROID_NDK_HOME} RUN echo "accept all licenses" # Accept all licenses diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile index 2eef0cb6..ba089fca 100644 --- a/docker/android-sdk/Dockerfile +++ b/docker/android-sdk/Dockerfile @@ -7,7 +7,7 @@ LABEL Description="Android SDK baseimage based on debian:bookworm" Vendor="LEAP" # --- Install System Dependencies # Make sure debconf doesn't complain about lack of interactivity -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # Need docker package in order to do Docker-in-Docker (DIND) RUN apt-get update -qq && \ @@ -45,15 +45,14 @@ RUN locale-gen en_US.UTF-8 # Set Default Locale RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG en_US.UTF-8 +ENV LANG=en_US.UTF-8 # ------------------------------------------------------ # --- Install Android SDK Tools -ENV ANDROID_HOME /opt/android-sdk-linux -ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -ENV ANDROID_SDK_ROOT ${ANDROID_HOME} -ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64 +ENV ANDROID_HOME=/opt/android-sdk-linux +ENV ANDROID_SDK_URL=https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip +ENV ANDROID_SDK_ROOT=${ANDROID_HOME} RUN echo $JAVA_HOME RUN java --version |