Skip to content

Commit 0613cf6

Browse files
feat: [BC] Python 2 for all target platforms (#160)
* feat: python-is-python3 and move build essentials to base * feat: use manual symlink instead and include pip3 * fix: derp * fix: python already exists * feat: add python install * Apply suggestions from code review Co-authored-by: David Finol <[email protected]> * go back to installing python2 Co-authored-by: David Finol <[email protected]> * remove symlinks Co-authored-by: David Finol <[email protected]> * redistribute installations based on their weight Co-authored-by: David Finol <[email protected]>
1 parent cfc2efd commit 0613cf6

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

images/ubuntu/base/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ RUN apt-get -q update \
2727
libxss1 \
2828
cpio \
2929
lsb-release \
30+
python \
31+
python-setuptools \
3032
xvfb \
3133
xz-utils \
3234
&& apt-get clean \
@@ -50,7 +52,7 @@ RUN apt-get -q update \
5052
&& apt-get -q install -y --no-install-recommends software-properties-common \
5153
&& add-apt-repository -y ppa:ubuntu-toolchain-r/test \
5254
&& apt-get -q install -y --only-upgrade libstdc++6 \
53-
&& add-apt-repository -y --remove ppa:ubuntu-toolchain-r/test \
55+
&& add-apt-repository -y --remove ppa:ubuntu-toolchain-r/test \
5456
&& apt-get -q remove -y --auto-remove software-properties-common \
5557
&& apt-get clean \
5658
&& rm -rf /var/lib/apt/lists/*

images/ubuntu/editor/Dockerfile

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ RUN echo "$version-$module" | grep -q -vP '^20(?!18).*android' \
173173
&& apt-get clean \
174174
&& rm -rf /var/lib/apt/lists/* \
175175
# Accept licenses
176-
&& yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses \
176+
&& yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses \
177177
\
178178
# Update alias 'unity-editor'
179179
&& { \
@@ -206,21 +206,11 @@ RUN echo "$module" | grep -q -v '\(webgl\|linux-il2cpp\)' \
206206
|| : \
207207
&& apt-get -q update \
208208
&& apt-get -q install -y --no-install-recommends --allow-downgrades \
209-
python \
210-
python-setuptools \
211209
build-essential \
212210
clang \
213211
&& apt-get clean \
214212
&& rm -rf /var/lib/apt/lists/*
215213

216-
#=======================================================================================
217-
# [android, ios] python 3 support
218-
#=======================================================================================
219-
RUN echo "$module" | grep -q -v '\(android\|ios\)' \
220-
&& exit 0 \
221-
|| : \
222-
&& ln -s /usr/bin/python3 /usr/bin/python
223-
224214
#=======================================================================================
225215
# [2019.x] libnotify4 libunwind-dev libssl1.0
226216
#=======================================================================================

0 commit comments

Comments
 (0)