From b8c81f46fb32a418cbde71a5607998ad3d8acbaf Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Mon, 4 Mar 2024 23:38:09 -0800 Subject: [PATCH] all builds build --- Dockerfile | 14 +++++++++----- README.md | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0196087..e92ae5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ -# Ubuntu 20.04 for that slightly older and more compat glibc +# Debian Bullseye for that slightly older and more compat glibc FROM debian:bullseye -# eclipse-temurin:8-jdk-focal - # compile tools we need including for cross compiling to windows and arm8 # also ssl certs, ssh, and jq for deployment related tasks +# and set locale per adoptium jdk focale Dockerfile RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends \ @@ -16,10 +15,15 @@ RUN set -eux; \ wget curl \ unzip \ fontconfig \ - netcat git wget libc6-dev make gcc g++ pkg-config g\+\+-mingw-w64 \ - gcc-aarch64-linux-gnu libc6-dev \ + netcat git wget libc6-dev make gcc g++ pkg-config \ jq openssh-client ca-certificates p11-kit tzdata locales \ + g++-mingw-w64-x86-64 \ + nsis \ + wine \ + wine64 \ ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/*; diff --git a/README.md b/README.md index 51554ff..60b538c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Versions are: - 2024.02 - Go 1.21.5 - - glibc 2.31 from Ubuntu 20.04 + - glibc 2.31 from Debian Bullseye - Android API 31 - NDK 22.1.7171670 - arm8 gcc cross compiler