From fa6003aca3dc38a57209ea3fa0b548801e6308f4 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Sun, 21 Jul 2024 22:51:34 +0200 Subject: [PATCH] Fix LegacyKeyValueFormat in Dockerfile --- android-sdk/Dockerfile | 16 ++++++++-------- android-sdk/firebase-test-lab/Dockerfile | 4 ++-- android-sdk/vnc/Dockerfile | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/android-sdk/Dockerfile b/android-sdk/Dockerfile index 2d9b8cd..f7c6b77 100644 --- a/android-sdk/Dockerfile +++ b/android-sdk/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:22.04 # Author # ---------------------------------------------------------------------- # -LABEL maintainer "thyrlian@gmail.com" +LABEL maintainer="thyrlian@gmail.com" # support multiarch: i386 architecture # install Java @@ -43,7 +43,7 @@ RUN cd /opt && \ # download and install Android SDK # https://developer.android.com/studio#command-line-tools-only ARG ANDROID_SDK_VERSION=11076708 -ENV ANDROID_HOME /opt/android-sdk +ENV ANDROID_HOME=/opt/android-sdk RUN mkdir -p ${ANDROID_HOME}/cmdline-tools && \ wget -q https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_VERSION}_latest.zip && \ unzip *tools*linux*.zip -d ${ANDROID_HOME}/cmdline-tools && \ @@ -51,15 +51,15 @@ RUN mkdir -p ${ANDROID_HOME}/cmdline-tools && \ rm *tools*linux*.zip # set the environment variables -ENV JAVA_HOME /usr/lib/jvm/java-${JDK_VERSION}-openjdk-amd64 -ENV GRADLE_HOME /opt/gradle -ENV KOTLIN_HOME /opt/kotlinc -ENV PATH ${PATH}:${GRADLE_HOME}/bin:${KOTLIN_HOME}/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/cmdline-tools/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/emulator +ENV JAVA_HOME=/usr/lib/jvm/java-${JDK_VERSION}-openjdk-amd64 +ENV GRADLE_HOME=/opt/gradle +ENV KOTLIN_HOME=/opt/kotlinc +ENV PATH=${PATH}:${GRADLE_HOME}/bin:${KOTLIN_HOME}/bin:${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/cmdline-tools/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/emulator # WORKAROUND: for issue https://issuetracker.google.com/issues/37137213 -ENV LD_LIBRARY_PATH ${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib +ENV LD_LIBRARY_PATH=${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib # patch emulator issue: Running as root without --no-sandbox is not supported. See https://crbug.com/638180. # https://doc.qt.io/qt-5/qtwebengine-platform-notes.html#sandboxing-support -ENV QTWEBENGINE_DISABLE_SANDBOX 1 +ENV QTWEBENGINE_DISABLE_SANDBOX=1 # accept the license agreements of the SDK components ADD license_accepter.sh /opt/ diff --git a/android-sdk/firebase-test-lab/Dockerfile b/android-sdk/firebase-test-lab/Dockerfile index 7715efe..73c255c 100644 --- a/android-sdk/firebase-test-lab/Dockerfile +++ b/android-sdk/firebase-test-lab/Dockerfile @@ -8,13 +8,13 @@ FROM thyrlian/android-sdk:latest # Authors # ---------------------------------------------------------------------- # -LABEL maintainer "jaime.toca.munoz@gmail.com, thyrlian@gmail.com" +LABEL maintainer="jaime.toca.munoz@gmail.com, thyrlian@gmail.com" # download Google Cloud SDK and dependencies needed # https://cloud.google.com/sdk/docs/install#deb # disable update checker for installation # change JSON for futures updates -ENV GCLOUD_SDK_CONFIG /usr/lib/google-cloud-sdk/lib/googlecloudsdk/core/config.json +ENV GCLOUD_SDK_CONFIG=/usr/lib/google-cloud-sdk/lib/googlecloudsdk/core/config.json RUN apt-get update && \ apt-get install -y apt-transport-https ca-certificates gnupg && \ echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \ diff --git a/android-sdk/vnc/Dockerfile b/android-sdk/vnc/Dockerfile index 8b3d38d..73131d0 100644 --- a/android-sdk/vnc/Dockerfile +++ b/android-sdk/vnc/Dockerfile @@ -8,11 +8,11 @@ FROM thyrlian/android-sdk:latest # Author # ---------------------------------------------------------------------- # -LABEL maintainer "thyrlian@gmail.com" +LABEL maintainer="thyrlian@gmail.com" # install and configure VNC server -ENV USER root -ENV DISPLAY :1 +ENV USER=root +ENV DISPLAY=:1 EXPOSE 5901 ADD vncpass.sh /tmp/ ADD watchdog.sh /usr/local/bin/