Spaces:
Runtime error
Runtime error
Update Dockerfile
Browse files- Dockerfile +70 -110
Dockerfile
CHANGED
|
@@ -3,133 +3,93 @@ FROM ubuntu:22.04
|
|
| 3 |
ENV DEBIAN_FRONTEND=noninteractive
|
| 4 |
ENV HOSTNAME=xro
|
| 5 |
|
| 6 |
-
# -----------------------------
|
| 7 |
-
|
| 8 |
# Base packages
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
|
| 34 |
-
|
| 35 |
-
|
| 36 |
-
|
| 37 |
-
|
| 38 |
-
|
| 39 |
-
|
| 40 |
-
|
| 41 |
-
|
| 42 |
-
|
| 43 |
-
|
| 44 |
-
|
| 45 |
-
|
| 46 |
-
|
| 47 |
-
|
| 48 |
-
|
| 49 |
-
|
| 50 |
-
xterm
|
| 51 |
-
openjdk-17-jdk
|
| 52 |
-
gradle
|
| 53 |
&& rm -rf /var/lib/apt/lists/*
|
| 54 |
|
| 55 |
-
# -----------------------------
|
| 56 |
-
|
| 57 |
# Android SDK
|
| 58 |
-
|
| 59 |
-
|
| 60 |
-
|
| 61 |
-
|
| 62 |
-
wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
|
| 63 |
-
-O /tmp/cmdtools.zip &&
|
| 64 |
-
unzip /tmp/cmdtools.zip -d /opt/android-sdk/cmdline-tools &&
|
| 65 |
-
mv /opt/android-sdk/cmdline-tools/cmdline-tools /opt/android-sdk/cmdline-tools/latest &&
|
| 66 |
rm /tmp/cmdtools.zip
|
| 67 |
|
| 68 |
ENV ANDROID_HOME=/opt/android-sdk
|
| 69 |
ENV ANDROID_SDK_ROOT=/opt/android-sdk
|
| 70 |
ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools
|
| 71 |
|
| 72 |
-
# -----------------------------
|
| 73 |
-
|
| 74 |
# Accept licenses
|
| 75 |
-
|
| 76 |
-
|
| 77 |
-
|
| 78 |
-
RUN
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
| 84 |
-
|
| 85 |
-
|
| 86 |
-
|
| 87 |
-
"
|
| 88 |
-
|
| 89 |
-
"
|
| 90 |
-
"
|
| 91 |
-
"
|
| 92 |
-
"
|
| 93 |
-
"
|
| 94 |
-
"
|
| 95 |
-
"
|
| 96 |
-
"
|
| 97 |
-
"platforms;android-21"
|
| 98 |
-
|
| 99 |
-
"build-tools;34.0.0"
|
| 100 |
-
"build-tools;33.0.2"
|
| 101 |
-
"build-tools;30.0.3"
|
| 102 |
-
"build-tools;29.0.3"
|
| 103 |
-
"build-tools;28.0.3"
|
| 104 |
-
|
| 105 |
-
"sources;android-34"
|
| 106 |
-
"sources;android-30"
|
| 107 |
-
|
| 108 |
-
"cmake;3.22.1"
|
| 109 |
-
|
| 110 |
-
"ndk;26.1.10909125"
|
| 111 |
-
"ndk;23.2.8568313"
|
| 112 |
"ndk;21.4.7075529"
|
| 113 |
|
| 114 |
-
# -----------------------------
|
| 115 |
-
|
| 116 |
# Android Studio
|
| 117 |
-
|
| 118 |
-
|
| 119 |
-
|
| 120 |
-
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
|
| 121 |
-
-O /tmp/android-studio.tar.gz &&
|
| 122 |
-
tar -xzf /tmp/android-studio.tar.gz -C /opt/ &&
|
| 123 |
rm /tmp/android-studio.tar.gz
|
| 124 |
|
| 125 |
ENV PATH=$PATH:/opt/android-studio/bin
|
| 126 |
|
| 127 |
-
# -----------------------------
|
| 128 |
-
|
| 129 |
-
# noVNC fix
|
| 130 |
-
|
| 131 |
-
# -----------------------------
|
| 132 |
-
|
| 133 |
RUN ln -s /usr/share/novnc/vnc.html /usr/share/novnc/index.html || true
|
| 134 |
|
| 135 |
WORKDIR /workspace
|
|
@@ -139,4 +99,4 @@ RUN chmod +x /start.sh
|
|
| 139 |
|
| 140 |
EXPOSE 7860
|
| 141 |
|
| 142 |
-
CMD ["/start.sh"]
|
|
|
|
| 3 |
ENV DEBIAN_FRONTEND=noninteractive
|
| 4 |
ENV HOSTNAME=xro
|
| 5 |
|
|
|
|
|
|
|
| 6 |
# Base packages
|
| 7 |
+
RUN apt-get update && apt-get install -y \
|
| 8 |
+
ca-certificates \
|
| 9 |
+
curl \
|
| 10 |
+
wget \
|
| 11 |
+
git \
|
| 12 |
+
sudo \
|
| 13 |
+
htop \
|
| 14 |
+
btop \
|
| 15 |
+
neovim \
|
| 16 |
+
nano \
|
| 17 |
+
lsof \
|
| 18 |
+
tmux \
|
| 19 |
+
screen \
|
| 20 |
+
unzip \
|
| 21 |
+
zip \
|
| 22 |
+
python3 \
|
| 23 |
+
python3-pip \
|
| 24 |
+
libxtst6 \
|
| 25 |
+
libxrender1 \
|
| 26 |
+
libxi6 \
|
| 27 |
+
libxext6 \
|
| 28 |
+
libx11-6 \
|
| 29 |
+
libxrandr2 \
|
| 30 |
+
libxfixes3 \
|
| 31 |
+
libxcursor1 \
|
| 32 |
+
libxcomposite1 \
|
| 33 |
+
libxdamage1 \
|
| 34 |
+
libxss1 \
|
| 35 |
+
libglib2.0-0 \
|
| 36 |
+
libgtk-3-0 \
|
| 37 |
+
libatk1.0-0 \
|
| 38 |
+
fonts-dejavu \
|
| 39 |
+
fonts-liberation \
|
| 40 |
+
xvfb \
|
| 41 |
+
x11vnc \
|
| 42 |
+
novnc \
|
| 43 |
+
websockify \
|
| 44 |
+
openbox \
|
| 45 |
+
xterm \
|
| 46 |
+
openjdk-17-jdk \
|
| 47 |
+
gradle \
|
|
|
|
|
|
|
|
|
|
| 48 |
&& rm -rf /var/lib/apt/lists/*
|
| 49 |
|
|
|
|
|
|
|
| 50 |
# Android SDK
|
| 51 |
+
RUN mkdir -p /opt/android-sdk/cmdline-tools && \
|
| 52 |
+
wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip && \
|
| 53 |
+
unzip /tmp/cmdtools.zip -d /opt/android-sdk/cmdline-tools && \
|
| 54 |
+
mv /opt/android-sdk/cmdline-tools/cmdline-tools /opt/android-sdk/cmdline-tools/latest && \
|
|
|
|
|
|
|
|
|
|
|
|
|
| 55 |
rm /tmp/cmdtools.zip
|
| 56 |
|
| 57 |
ENV ANDROID_HOME=/opt/android-sdk
|
| 58 |
ENV ANDROID_SDK_ROOT=/opt/android-sdk
|
| 59 |
ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools
|
| 60 |
|
|
|
|
|
|
|
| 61 |
# Accept licenses
|
| 62 |
+
RUN yes | sdkmanager --licenses
|
| 63 |
+
|
| 64 |
+
# Install SDKs
|
| 65 |
+
RUN sdkmanager \
|
| 66 |
+
"platform-tools" \
|
| 67 |
+
"platforms;android-34" \
|
| 68 |
+
"platforms;android-33" \
|
| 69 |
+
"platforms;android-30" \
|
| 70 |
+
"platforms;android-29" \
|
| 71 |
+
"platforms;android-28" \
|
| 72 |
+
"platforms;android-26" \
|
| 73 |
+
"platforms;android-24" \
|
| 74 |
+
"platforms;android-23" \
|
| 75 |
+
"platforms;android-21" \
|
| 76 |
+
"build-tools;34.0.0" \
|
| 77 |
+
"build-tools;33.0.2" \
|
| 78 |
+
"build-tools;30.0.3" \
|
| 79 |
+
"build-tools;29.0.3" \
|
| 80 |
+
"build-tools;28.0.3" \
|
| 81 |
+
"cmake;3.22.1" \
|
| 82 |
+
"ndk;26.1.10909125" \
|
| 83 |
+
"ndk;23.2.8568313" \
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 84 |
"ndk;21.4.7075529"
|
| 85 |
|
|
|
|
|
|
|
| 86 |
# Android Studio
|
| 87 |
+
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/android-studio.tar.gz && \
|
| 88 |
+
tar -xzf /tmp/android-studio.tar.gz -C /opt/ && \
|
|
|
|
|
|
|
|
|
|
|
|
|
| 89 |
rm /tmp/android-studio.tar.gz
|
| 90 |
|
| 91 |
ENV PATH=$PATH:/opt/android-studio/bin
|
| 92 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 93 |
RUN ln -s /usr/share/novnc/vnc.html /usr/share/novnc/index.html || true
|
| 94 |
|
| 95 |
WORKDIR /workspace
|
|
|
|
| 99 |
|
| 100 |
EXPOSE 7860
|
| 101 |
|
| 102 |
+
CMD ["/start.sh"]
|