From 10da9154c52e4f776f0a86dac7ce51bf98313e29 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 28 Oct 2023 17:36:29 +0000 Subject: [PATCH] disabling android additions. --- Dockerfile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68898aa..8f55331 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM lscr.io/linuxserver/webtop:ubuntu-mate # Set environment variables to non-interactive (this prevents some prompts) ENV DEBIAN_FRONTEND=non-interactive -ENV ANDROID_HOME=~/android-sdk -ENV PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools +# ENV ANDROID_HOME=~/android-sdk +# ENV PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools ENV AVD_SETUP='avdmanager create avd --name MyAndroidEmulator --package "system-images;android-29;default;x86_64"' ENV AVD_START='./emulator -avd MyAndroidEmulator' @@ -14,7 +14,6 @@ RUN apt-get update && apt-get install -y \ wget \ gramps \ golang-go \ - openjdk-11-jdk \ qemu-kvm \ libvirt-daemon-system \ libvirt-clients \ @@ -24,22 +23,24 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* && \ mkdir -p /root/.ssh/ && \ chmod 600 /root/.ssh + # openjdk-11-jdk \ + RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \ dpkg -i google-chrome-stable_current_amd64.deb -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 -# install android emulator because I don't want an android device. +# ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 +# # install android emulator because I don't want an android device. WORKDIR /sdk RUN wget https://dl.google.com/android/repository/commandlinetools-linux-7302050_latest.zip && \ unzip commandlinetools-linux-7302050_latest.zip && \ rm commandlinetools-linux-7302050_latest.zip -# Set environment variables -ENV ANDROID_HOME /sdk -ENV PATH $PATH:/sdk/cmdline-tools/bin -#RUN apt install qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils adb -RUN sdkmanager --list && \ - sdkmanager "platforms;android-29" "system-images;android-29;default;x86_64" +# # Set environment variables +# ENV ANDROID_HOME /sdk +# ENV PATH $PATH:/sdk/cmdline-tools/bin +# #RUN apt install qemu-kvm libvirt-daemon-system libvirt-clients bridge-utils adb +# RUN sdkmanager --list && \ +# sdkmanager "platforms;android-29" "system-images;android-29;default;x86_64" # Ensure Go binaries are in the PATH