From b20be8a11576b65584eebfd17feda1025f4b1f1f Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sat, 4 Jan 2020 00:19:29 +0200 Subject: [PATCH] docker image: install locales and configure en_US.UTF-8 as default --- scripts/Dockerfile | 3 +-- scripts/setup-ubuntu.sh | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile b/scripts/Dockerfile index b673c3b919f19d..f5ad1dbc3fcbbd 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -7,7 +7,7 @@ FROM ubuntu:19.10 # Fix locale to avoid warnings: -ENV LANG C.UTF-8 +ENV LANG en_US.UTF-8 # Needed for setup: COPY ./setup-ubuntu.sh ./setup-android-sdk.sh ./properties.sh /tmp/ @@ -34,4 +34,3 @@ USER builder:builder # We expect this to be mounted with '-v $PWD:/home/builder/termux-packages': WORKDIR /home/builder/termux-packages - diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 6cf97350e3c6db..b232e0484ca3c7 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -2,6 +2,7 @@ set -e -u PACKAGES="" +PACKAGES+=" locales" PACKAGES+=" asciidoc" PACKAGES+=" asciidoctor" # Used by weechat for man pages. PACKAGES+=" automake" @@ -79,5 +80,8 @@ curl -O http://security.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jr sudo dpkg -i openjdk-8-jre-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jre_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jdk_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jdk-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb || sudo apt install -f -y rm openjdk-8-jre-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jre_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jdk_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb openjdk-8-jdk-headless_8u212-b03-0ubuntu1."$UBUNTU_VERSION"_amd64.deb +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 + sudo mkdir -p /data/data/com.termux/files/usr sudo chown -R $(whoami) /data