-
-
Notifications
You must be signed in to change notification settings - Fork 125
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.
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
Update ubuntu version from 18.04 to 22.04 #216
Merged
Merged
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
740d6d5
Update base image to ubuntu 22.04 and fix dependencies
9aed6bb
Replace python3 with python-is-python3
82776ba
Clear python cache and icons
69723a5
Remove build-essentials
c9ec152
Add libssl fix for Ubuntu 22.04
598903b
Trigger build
2d09be6
Add apt-get install flags
82652cf
Increase build timeout
3cbbee8
Install libssl1.1 and libssl1.0.0 from focal and bionic deb package r…
2b5cc0f
Install libssl directly from source
8388442
Remove libssl1.0.0 from apt-get install
2efb065
Fix brotli compression by installing python-setuptools
9fc154d
Update unityhub installation as apt-key is deprecated
8b8bd45
Add unstable unityhub distribution
8625311
Increase build timeout
a9e878b
Add python2 symlink
1ad418c
Instal python2 for failed builds
ebe0754
Downgrade gzip version
bbbb6f6
Install python2 from python-setuptools
df40651
Minor bug fix
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,7 +85,11 @@ RUN echo "$version-$module" | grep -q -v '^\(2019.3.[6-9]f\|2019.3.1[0-9]f\|2019 | |
#======================================================================================= | ||
RUN echo "$version-$module" | grep -q -v '^\(2020.1\|2020.2.0f\|2020.2.1f\).*-webgl' \ | ||
&& exit 0 \ | ||
|| echo 'export GZIP=-f' >> /usr/bin/unity-editor.d/webgl-2020.1-2.sh | ||
|| : \ | ||
&& wget https://old-releases.ubuntu.com/ubuntu/pool/main/g/gzip/gzip_1.6-5ubuntu2_amd64.deb \ | ||
&& dpkg -i gzip_1.6-5ubuntu2_amd64.deb \ | ||
&& rm gzip_1.6-5ubuntu2_amd64.deb \ | ||
&& echo 'export GZIP=-f' >> /usr/bin/unity-editor.d/webgl-2020.1-2.sh | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Gzip environment variables are deprecated in the newer versions. The only way I can think of to fix the following issue is to downgrade gzip to an older version. Let me know if anyone has any other ideas. |
||
|
||
|
||
########################### | ||
|
@@ -231,7 +235,7 @@ RUN echo "$module" | grep -q -v 'webgl' \ | |
&& rm -rf /var/lib/apt/lists/* | ||
|
||
#======================================================================================= | ||
# [webgl, il2cpp] python python-setuptools build-essential clang | ||
# [webgl, il2cpp] build-essential clang | ||
#======================================================================================= | ||
RUN echo "$module" | grep -q -v '\(webgl\|linux-il2cpp\)' \ | ||
&& exit 0 \ | ||
|
@@ -244,7 +248,7 @@ RUN echo "$module" | grep -q -v '\(webgl\|linux-il2cpp\)' \ | |
&& rm -rf /var/lib/apt/lists/* | ||
|
||
#======================================================================================= | ||
# [2019.x] libnotify4 libunwind-dev libssl1.0 | ||
# [2019.x] libnotify4 libunwind-dev libssl1.0.0 | ||
#======================================================================================= | ||
RUN echo "$version" | grep -q -v '^2019.' \ | ||
&& exit 0 \ | ||
|
@@ -253,9 +257,26 @@ RUN echo "$version" | grep -q -v '^2019.' \ | |
&& apt-get -q install -y --no-install-recommends --allow-downgrades \ | ||
libnotify4 \ | ||
libunwind-dev \ | ||
libssl1.0 \ | ||
&& apt-get clean \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
&& rm -rf /var/lib/apt/lists/* \ | ||
# Install libssl1.0.0 | ||
&& wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.0.0_1.0.2g-1ubuntu4.20_amd64.deb \ | ||
&& dpkg -i libssl1.0.0_1.0.2g-1ubuntu4.20_amd64.deb \ | ||
&& rm libssl1.0.0_1.0.2g-1ubuntu4.20_amd64.deb | ||
|
||
#======================================================================================= | ||
# [2018.x/2019.x/2020.x/2021.1.x-webgl] python2 | ||
#======================================================================================= | ||
|
||
RUN echo "$version-$module" | grep -q -v '^\(2018\|2019\|2020\|2021.1\).*webgl' \ | ||
&& exit 0 \ | ||
|| : \ | ||
&& apt-get -q update \ | ||
&& apt-get -q install -y --no-install-recommends --allow-downgrades \ | ||
python-setuptools \ | ||
&& apt-get clean \ | ||
&& rm -rf /var/lib/apt/lists/* \ | ||
&& ln -s /usr/bin/python2 /usr/bin/python | ||
|
||
#======================================================================================= | ||
# [2018.x/2019.x/2020.1.x-webgl] support brotli compression for linux | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#163
New way to install libstdc++6