proti0070 commited on
Commit
1b4bccb
·
verified ·
1 Parent(s): 0a5e99c

Update Dockerfile

Browse files
Files changed (1) hide show
  1. Dockerfile +5 -14
Dockerfile CHANGED
@@ -22,10 +22,10 @@ RUN apt-get update && apt-get install -y \
22
  python3-pip \
23
  openjdk-17-jdk \
24
  xvfb \
25
- x11vnc \
26
- openbox \
27
  websockify \
28
  novnc \
 
29
  && rm -rf /var/lib/apt/lists/*
30
 
31
  # ----------------------------
@@ -37,19 +37,15 @@ RUN mkdir -p /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 | sdkmanager --licenses
41
 
42
- # old + new sdk (ARMv7 supported)
43
- RUN sdkmanager \
44
  "platform-tools" \
45
  "platforms;android-34" \
46
- "platforms;android-30" \
47
  "platforms;android-28" \
48
- "platforms;android-26" \
49
  "platforms;android-24" \
50
  "platforms;android-21" \
51
  "build-tools;34.0.0" \
52
- "build-tools;30.0.3" \
53
  "build-tools;28.0.3"
54
 
55
  # ----------------------------
@@ -59,16 +55,11 @@ RUN wget -q https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.3.1.
59
  tar -xzf /tmp/as.tar.gz -C /opt/ && \
60
  rm /tmp/as.tar.gz
61
 
62
- # ----------------------------
63
- # noVNC fix
64
- # ----------------------------
65
- RUN ln -s /usr/share/novnc/vnc.html /usr/share/novnc/index.html
66
-
67
  WORKDIR /workspace
68
 
69
  COPY start.sh /start.sh
70
  RUN chmod +x /start.sh
71
 
72
- EXPOSE 7860
73
 
74
  CMD ["/start.sh"]
 
22
  python3-pip \
23
  openjdk-17-jdk \
24
  xvfb \
25
+ xpra \
 
26
  websockify \
27
  novnc \
28
+ openbox \
29
  && rm -rf /var/lib/apt/lists/*
30
 
31
  # ----------------------------
 
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
  # ----------------------------
 
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
+ EXPOSE 7860 10000
64
 
65
  CMD ["/start.sh"]