From c31ee772c293a2b0a6f458972e9fb3e14e8858d2 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 3 Feb 2022 20:57:57 +0100 Subject: [PATCH] Update docker image to Ubuntu 21.10 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) --- scripts/Dockerfile | 2 +- scripts/setup-ubuntu.sh | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 8c624679e..56a85784d 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -4,7 +4,7 @@ # docker push termux/package-builder # This is done after changing this file or any of the # scripts/setup-{ubuntu,android-sdk}.sh setup scripts. -FROM ubuntu:21.04 +FROM ubuntu:21.10 # Fix locale to avoid warnings: ENV LANG en_US.UTF-8 diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index dc1512667..29f3fee4a 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -132,9 +132,6 @@ PACKAGES+=" patchelf" # Needed by wrk. PACKAGES+=" luajit" -# Needed by gitea. -PACKAGES+=" npm" - # Needed by libduktape PACKAGES+=" bc" @@ -222,33 +219,14 @@ fi $SUDO dpkg --add-architecture i386 $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 \ 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. 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 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 echo -e 'LANG="en_US.UTF-8"\nLANGUAGE="en_US:en"\n' | $SUDO tee -a /etc/default/locale