sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update docker image to Ubuntu 21.10

Browse Source 
A ./build-all.sh -i finishes successfully.  (There seem to be some
issue with the build-all script where some packages are not built
though)
This commit is contained in:
Henrik Grimler 2022-02-03 20:57:57 +01:00
parent c125591bb6
commit c31ee772c2
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/Dockerfile
View File

@ -4,7 +4,7 @@
# docker push termux/package-builder # docker push termux/package-builder
# This is done after changing this file or any of the # This is done after changing this file or any of the
# scripts/setup-{ubuntu,android-sdk}.sh setup scripts. # scripts/setup-{ubuntu,android-sdk}.sh setup scripts.
FROM ubuntu:21.04 FROM ubuntu:21.10
# Fix locale to avoid warnings: # Fix locale to avoid warnings:
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8

22
scripts/setup-ubuntu.sh
View File

@ -132,9 +132,6 @@ PACKAGES+=" patchelf"
# Needed by wrk. # Needed by wrk.
PACKAGES+=" luajit" PACKAGES+=" luajit"
# Needed by gitea.
PACKAGES+=" npm"
# Needed by libduktape # Needed by libduktape
PACKAGES+=" bc" PACKAGES+=" bc"
@ -222,33 +219,14 @@ fi
$SUDO dpkg --add-architecture i386 $SUDO dpkg --add-architecture i386
$SUDO apt-get -yq update $SUDO apt-get -yq update
# Newer Python versions for host builds
if dpkg --compare-versions $(lsb_release -rs) lt 21.04; then
$SUDO add-apt-repository -y ppa:deadsnakes/ppa
INSTALL_NEW_PIP3=true
PACKAGES+=" python3.10-distutils"
else
INSTALL_NEW_PIP3=false
fi
$SUDO env DEBIAN_FRONTEND=noninteractive \ $SUDO env DEBIAN_FRONTEND=noninteractive \
apt-get install -yq --no-install-recommends $PACKAGES apt-get install -yq --no-install-recommends $PACKAGES
if $INSTALL_NEW_PIP3; then
curl -L --output /tmp/get-pip.py https://bootstrap.pypa.io/pip/get-pip.py
$SUDO python3.10 /tmp/get-pip.py
rm -f /tmp/get-pip.py
fi
# Pip for python2. # Pip for python2.
curl -L --output /tmp/py2-get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py curl -L --output /tmp/py2-get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py
$SUDO python2 /tmp/py2-get-pip.py $SUDO python2 /tmp/py2-get-pip.py
rm -f /tmp/py2-get-pip.py rm -f /tmp/py2-get-pip.py
# Install Nodejs. Needed by Gitea.
curl -fsSL https://deb.nodesource.com/setup_lts.x | $SUDO bash -
$SUDO apt install -y nodejs
$SUDO locale-gen --purge en_US.UTF-8 $SUDO locale-gen --purge en_US.UTF-8
echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' | $SUDO tee -a /etc/default/locale echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' | $SUDO tee -a /etc/default/locale