Skip to content

Commit 3d0fbf1

Browse files
authored
Merge pull request #64 from oliverlockwood/issue-63-update-parent-ubuntu-image-to-allow-building-glibc-2.42-or-later
Update parent Ubuntu image from 22.04 to 24.04, to allow building glibc 2.42 or later
2 parents 85ebad3 + a5bcc51 commit 3d0fbf1

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ executors:
2222
docker:
2323
- image: docker:git
2424
environment:
25-
GLIBC_VERSION: 2.39
25+
GLIBC_VERSION: 2.42
2626
resource_class: arm.large
2727
working_directory: ~/docker-glibc-builder
2828
builder-x86:
2929
docker:
3030
- image: docker:git
3131
environment:
32-
GLIBC_VERSION: 2.39
32+
GLIBC_VERSION: 2.42
3333
resource_class: large
3434
working_directory: ~/docker-glibc-builder
3535
artefact-uploader:

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22
LABEL maintainer="Sasha Gerrand <github+docker-glibc-builder@sgerrand.com>"
33
ENV DEBIAN_FRONTEND=noninteractive \
4-
GLIBC_VERSION=2.39 \
4+
GLIBC_VERSION=2.42 \
55
PREFIX_DIR=/usr/glibc-compat
66
RUN apt-get -q update \
77
&& apt-get -qy install \

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ A glibc binary package builder in Docker. Produces a glibc binary package that c
44

55
## Usage
66

7-
Build a glibc package based on version 2.39 with a prefix of `/usr/glibc-compat`:
7+
Build a glibc package based on version 2.42 with a prefix of `/usr/glibc-compat`:
88

9-
docker run --rm --env STDOUT=1 sgerrand/glibc-builder 2.39 /usr/glibc-compat > glibc-bin.tar.gz
9+
docker run --rm --env STDOUT=1 sgerrand/glibc-builder 2.42 /usr/glibc-compat > glibc-bin.tar.gz
1010

1111
You can also keep the container around and copy out the resulting file:
1212

13-
docker run --name glibc-binary sgerrand/glibc-builder 2.39 /usr/glibc-compat
14-
docker cp glibc-binary:/glibc-bin-2.39.tar.gz ./
13+
docker run --name glibc-binary sgerrand/glibc-builder 2.42 /usr/glibc-compat
14+
docker cp glibc-binary:/glibc-bin-2.42.tar.gz ./
1515
docker rm glibc-binary

0 commit comments

Comments
 (0)