Skip to content

Commit 7c9bcdd

Browse files
committed
Use Ubuntu 22.04 Docker images to make artifacts compatible with GLIBC 2.31
1 parent 8da791e commit 7c9bcdd

11 files changed

Lines changed: 20 additions & 11 deletions

File tree

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, windows-latest, macos-latest]
14+
os: [ubuntu-22.04, ubuntu-latest, windows-latest, macos-latest]
1515
runs-on: ${{ matrix.os }}
1616

1717
steps:

darwin-aarch64.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM --platform=$BUILDPLATFORM crazymax/osxcross:${OSXCROSS_VERSION}-ubuntu AS o
66
FROM ubuntu:24.04
77
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
88
--mount=type=cache,target=/var/lib/apt,sharing=locked \
9-
apt update && apt-get install -y clang build-essential
9+
apt-get update && apt-get install -y --no-install-recommends clang build-essential
1010
ENV PATH="/osxcross/bin:$PATH"
1111
ENV LD_LIBRARY_PATH="/osxcross/lib:$LD_LIBRARY_PATH"
1212
COPY --link --from=osxcross /osxcross /osxcross

darwin-x86-64.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FROM --platform=$BUILDPLATFORM crazymax/osxcross:${OSXCROSS_VERSION}-ubuntu AS o
66
FROM ubuntu:24.04
77
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
88
--mount=type=cache,target=/var/lib/apt,sharing=locked \
9-
apt update && apt-get install -y clang build-essential
9+
apt-get update && apt-get install -y --no-install-recommends clang build-essential
1010
ENV PATH="/osxcross/bin:$PATH"
1111
ENV LD_LIBRARY_PATH="/osxcross/lib:$LD_LIBRARY_PATH"
1212
COPY --link --from=osxcross /osxcross /osxcross

linux-aarch64.Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
FROM gcc:16.1
2-
RUN apt update
1+
# to make compiled artifacts compatible with GLIBC_2.31 used in Ubuntu 22.04
2+
FROM ubuntu:22.04
3+
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
4+
--mount=type=cache,target=/var/lib/apt,sharing=locked \
5+
apt-get update && apt-get install -y --no-install-recommends build-essential gcc-aarch64-linux-gnu libc6-dev-arm64-cross
6+
37
WORKDIR /work
48
ADD \
59
--checksum=sha256:6ad7783f272acfd116455c66a03298a0cac9a9168281df547969219112f0260f \
610
https://github.com/pganalyze/libpg_query/archive/refs/tags/18.0.0.tar.gz /work
711
RUN tar -zx --strip-components=1 -f 18.0.0.tar.gz
8-
RUN apt install -y gcc-aarch64-linux-gnu libc6-dev-arm64-cross
912
RUN make CC=aarch64-linux-gnu-gcc -j build_shared

linux-x86-64.Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
FROM gcc:16.1
2-
RUN apt update
1+
# to make compiled artifacts compatible with GLIBC_2.31 used in Ubuntu 22.04
2+
FROM ubuntu:22.04
3+
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
4+
--mount=type=cache,target=/var/lib/apt,sharing=locked \
5+
apt-get update && apt-get install -y --no-install-recommends build-essential gcc-x86-64-linux-gnu
6+
37
WORKDIR /work
48
ADD \
59
--checksum=sha256:6ad7783f272acfd116455c66a03298a0cac9a9168281df547969219112f0260f \
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
-52.3 KB
Binary file not shown.
-500 KB
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)