-
-
Notifications
You must be signed in to change notification settings - Fork 217
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix LegacyKeyValueFormat in Dockerfile
- Loading branch information
Showing
3 changed files
with
13 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ FROM ubuntu:22.04 | |
|
||
# Author | ||
# ---------------------------------------------------------------------- # | ||
LABEL maintainer "[email protected]" | ||
LABEL maintainer="[email protected]" | ||
|
||
# support multiarch: i386 architecture | ||
# install Java | ||
|
@@ -43,23 +43,23 @@ 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 && \ | ||
mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/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/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,13 +8,13 @@ FROM thyrlian/android-sdk:latest | |
|
||
# Authors | ||
# ---------------------------------------------------------------------- # | ||
LABEL maintainer "[email protected], [email protected]" | ||
LABEL maintainer="[email protected], [email protected]" | ||
|
||
# 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 && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,11 +8,11 @@ FROM thyrlian/android-sdk:latest | |
|
||
# Author | ||
# ---------------------------------------------------------------------- # | ||
LABEL maintainer "[email protected]" | ||
LABEL maintainer="[email protected]" | ||
|
||
# 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/ | ||
|