From 91892d5ea3b072f002c2ce1856d476580ac06a24 Mon Sep 17 00:00:00 2001 From: Sasha Gerrand Date: Tue, 10 Oct 2017 17:18:33 +0100 Subject: [PATCH 1/2] :rocket: Bump glibc version to 2.26 --- Dockerfile | 2 +- README.md | 8 ++++---- circle.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2bf9e0..dc84e8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu-debootstrap:14.04 MAINTAINER Sasha Gerrand ENV PREFIX_DIR /usr/glibc-compat -ENV GLIBC_VERSION 2.25 +ENV GLIBC_VERSION 2.26 RUN apt-get -q update \ && apt-get -qy install build-essential wget openssl gawk COPY configparams /glibc-build/configparams diff --git a/README.md b/README.md index 351cf42..0b915f2 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,16 @@ A glibc binary package builder in Docker. Produces a glibc binary package that c ## Usage -Build a glibc package based on version 2.25 with a prefix of `/usr/glibc-compat`: +Build a glibc package based on version 2.26 with a prefix of `/usr/glibc-compat`: ``` -docker run --rm -e STDOUT=1 sgerrand/glibc-builder 2.25 /usr/glibc-compat > glibc-bin.tar.gz +docker run --rm -e STDOUT=1 sgerrand/glibc-builder 2.26 /usr/glibc-compat > glibc-bin.tar.gz ``` You can also keep the container around and copy out the resulting file: ``` -docker run --name glibc-binary sgerrand/glibc-builder 2.25 /usr/glibc-compat -docker cp glibc-binary:/glibc-bin-2.25.tar.gz ./ +docker run --name glibc-binary sgerrand/glibc-builder 2.26 /usr/glibc-compat +docker cp glibc-binary:/glibc-bin-2.26.tar.gz ./ docker rm glibc-binary ``` diff --git a/circle.yml b/circle.yml index a1a36aa..724cde5 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ general: - "artifacts" machine: environment: - GLIBC_VERSION: 2.25 + GLIBC_VERSION: 2.26 pre: - sudo mv /usr/local/go /usr/local/go-1.6.2 - wget -q -O /tmp/go1.7.3.tgz https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz From b32cb5fa6a93da4311c71864f67806e331cb5f3a Mon Sep 17 00:00:00 2001 From: Sasha Gerrand Date: Tue, 10 Oct 2017 17:25:12 +0100 Subject: [PATCH 2/2] :zap: Migrate base image to a modern version of Ubuntu Resolves: configure: error: *** These critical programs are missing or too old: GNU ld compiler --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dc84e8d..929c8cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu-debootstrap:14.04 +FROM ubuntu:16.04 MAINTAINER Sasha Gerrand ENV PREFIX_DIR /usr/glibc-compat ENV GLIBC_VERSION 2.26