Spaces:
Runtime error
Runtime error
Update Dockerfile
Browse files- Dockerfile +12 -34
Dockerfile
CHANGED
|
@@ -6,60 +6,38 @@ ENV ANDROID_HOME=/opt/android-sdk
|
|
| 6 |
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
|
| 7 |
ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:/opt/android-studio/bin
|
| 8 |
|
| 9 |
-
#
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
RUN apt-get update && apt-get install -y \
|
| 13 |
-
ca-certificates \
|
| 14 |
-
curl \
|
| 15 |
-
wget \
|
| 16 |
-
git \
|
| 17 |
-
sudo \
|
| 18 |
-
nano \
|
| 19 |
-
unzip \
|
| 20 |
-
zip \
|
| 21 |
-
python3 \
|
| 22 |
-
python3-pip \
|
| 23 |
-
openjdk-17-jdk \
|
| 24 |
xvfb \
|
| 25 |
-
|
|
|
|
| 26 |
websockify \
|
| 27 |
novnc \
|
| 28 |
-
|
|
|
|
| 29 |
&& rm -rf /var/lib/apt/lists/*
|
| 30 |
|
| 31 |
-
#
|
| 32 |
-
# Android SDK
|
| 33 |
-
# ----------------------------
|
| 34 |
RUN mkdir -p /opt/android-sdk/cmdline-tools && \
|
| 35 |
wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip && \
|
| 36 |
unzip /tmp/cmdtools.zip -d /opt/android-sdk/cmdline-tools && \
|
| 37 |
mv /opt/android-sdk/cmdline-tools/cmdline-tools /opt/android-sdk/cmdline-tools/latest && \
|
| 38 |
rm /tmp/cmdtools.zip
|
| 39 |
|
| 40 |
-
RUN yes | /opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses || true
|
|
|
|
| 41 |
|
| 42 |
-
RUN /opt/android-sdk/cmdline-tools/latest/bin/sdkmanager \
|
| 43 |
-
"platform-tools" \
|
| 44 |
-
"platforms;android-34" \
|
| 45 |
-
"platforms;android-28" \
|
| 46 |
-
"platforms;android-24" \
|
| 47 |
-
"platforms;android-21" \
|
| 48 |
-
"build-tools;34.0.0" \
|
| 49 |
-
"build-tools;28.0.3"
|
| 50 |
-
|
| 51 |
-
# ----------------------------
|
| 52 |
# Android Studio
|
| 53 |
-
# ----------------------------
|
| 54 |
RUN wget -q https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.3.1.18/android-studio-2023.3.1.18-linux.tar.gz -O /tmp/as.tar.gz && \
|
| 55 |
tar -xzf /tmp/as.tar.gz -C /opt/ && \
|
| 56 |
rm /tmp/as.tar.gz
|
| 57 |
|
| 58 |
WORKDIR /workspace
|
| 59 |
-
|
| 60 |
COPY start.sh /start.sh
|
| 61 |
RUN chmod +x /start.sh
|
| 62 |
|
| 63 |
-
|
|
|
|
| 64 |
|
| 65 |
CMD ["/start.sh"]
|
|
|
|
| 6 |
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
|
| 7 |
ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:/opt/android-studio/bin
|
| 8 |
|
| 9 |
+
# Minimal dependencies
|
| 10 |
+
RUN apt-get update && apt-get install -y --no-install-recommends \
|
| 11 |
+
openjdk-17-jdk-headless \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
xvfb \
|
| 13 |
+
x11vnc \
|
| 14 |
+
openbox \
|
| 15 |
websockify \
|
| 16 |
novnc \
|
| 17 |
+
wget \
|
| 18 |
+
unzip \
|
| 19 |
&& rm -rf /var/lib/apt/lists/*
|
| 20 |
|
| 21 |
+
# Android SDK (minimal)
|
|
|
|
|
|
|
| 22 |
RUN mkdir -p /opt/android-sdk/cmdline-tools && \
|
| 23 |
wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip && \
|
| 24 |
unzip /tmp/cmdtools.zip -d /opt/android-sdk/cmdline-tools && \
|
| 25 |
mv /opt/android-sdk/cmdline-tools/cmdline-tools /opt/android-sdk/cmdline-tools/latest && \
|
| 26 |
rm /tmp/cmdtools.zip
|
| 27 |
|
| 28 |
+
RUN yes | /opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null 2>&1 || true
|
| 29 |
+
RUN /opt/android-sdk/cmdline-tools/latest/bin/sdkmanager "platform-tools" > /dev/null 2>&1
|
| 30 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 31 |
# Android Studio
|
|
|
|
| 32 |
RUN wget -q https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.3.1.18/android-studio-2023.3.1.18-linux.tar.gz -O /tmp/as.tar.gz && \
|
| 33 |
tar -xzf /tmp/as.tar.gz -C /opt/ && \
|
| 34 |
rm /tmp/as.tar.gz
|
| 35 |
|
| 36 |
WORKDIR /workspace
|
|
|
|
| 37 |
COPY start.sh /start.sh
|
| 38 |
RUN chmod +x /start.sh
|
| 39 |
|
| 40 |
+
# HF Spaces expects port 7860
|
| 41 |
+
EXPOSE 7860
|
| 42 |
|
| 43 |
CMD ["/start.sh"]
|