Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: [BC] Python 2 for all target platforms #160

Merged
merged 9 commits into from
Mar 19, 2022
Merged

feat: [BC] Python 2 for all target platforms #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
636ba2f
feat: python-is-python3 and move build essentials to base
webbertakken Mar 3, 2022
3a134d8
feat: use manual symlink instead and include pip3
webbertakken Mar 7, 2022
a27b034
fix: derp
webbertakken Mar 7, 2022
ec18f3a
fix: python already exists
webbertakken Mar 7, 2022
d3a8cbc
feat: add python install
webbertakken Mar 7, 2022
cfeb0f5
Apply suggestions from code review
webbertakken Mar 10, 2022
774b8b9
go back to installing python2
webbertakken Mar 11, 2022
6edb506
remove symlinks
webbertakken Mar 11, 2022
9b0148b
redistribute installations based on their weight
webbertakken Mar 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion images/ubuntu/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ RUN apt-get -q update \
libxss1 \
cpio \
lsb-release \
python \
python-setuptools \
webbertakken marked this conversation as resolved.
Show resolved Hide resolved
xvfb \
xz-utils \
&& apt-get clean \
Expand All @@ -50,7 +52,7 @@ RUN apt-get -q update \
&& apt-get -q install -y --no-install-recommends software-properties-common \
&& add-apt-repository -y ppa:ubuntu-toolchain-r/test \
&& apt-get -q install -y --only-upgrade libstdc++6 \
&& add-apt-repository -y --remove ppa:ubuntu-toolchain-r/test \
&& add-apt-repository -y --remove ppa:ubuntu-toolchain-r/test \
&& apt-get -q remove -y --auto-remove software-properties-common \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
Expand Down
12 changes: 1 addition & 11 deletions images/ubuntu/editor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ RUN echo "$version-$module" | grep -q -vP '^20(?!18).*android' \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
# Accept licenses
&& yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses \
&& yes | "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses \
\
# Update alias 'unity-editor'
&& { \
Expand Down Expand Up @@ -206,21 +206,11 @@ RUN echo "$module" | grep -q -v '\(webgl\|linux-il2cpp\)' \
|| : \
&& apt-get -q update \
&& apt-get -q install -y --no-install-recommends --allow-downgrades \
python \
python-setuptools \
build-essential \
clang \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

#=======================================================================================
# [android, ios] python 3 support
#=======================================================================================
RUN echo "$module" | grep -q -v '\(android\|ios\)' \
&& exit 0 \
|| : \
&& ln -s /usr/bin/python3 /usr/bin/python

#=======================================================================================
# [2019.x] libnotify4 libunwind-dev libssl1.0
#=======================================================================================
Expand Down