From b369f87158051f3bb085f0bb7896b96ec02390f5 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 13 Jun 2022 16:13:53 +0000 Subject: [PATCH] Alpine 3.16 & use new system lib --- .github/workflows/builder.yml | 6 +++--- README.md | 20 ++++++++++---------- python/3.10/Dockerfile | 2 ++ python/3.9/Dockerfile | 2 ++ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 6f33f5d..5b96cbe 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -8,7 +8,7 @@ on: env: BUILD_TYPE: base - ALPINE_LATEST: "3.15" + ALPINE_LATEST: "3.16" DEBIAN_LATEST: "bullseye" UBUNTU_LATEST: "20.4" RASPBIAN_LATEST: "bullseye" @@ -67,7 +67,7 @@ jobs: strategy: matrix: arch: ${{ fromJson(needs.init.outputs.architectures_alpine) }} - version: ["3.12", "3.13", "3.14", "3.15"] + version: ["3.13", "3.14", "3.15", "3.16"] steps: - name: Checkout the repository uses: actions/checkout@v2 @@ -261,7 +261,7 @@ jobs: strategy: matrix: arch: ${{ fromJson(needs.init.outputs.architectures_alpine) }} - version: ["3.13", "3.14", "3.15"] + version: ["3.14", "3.15", "3.16"] python: ["3.8", "3.9", "3.10"] steps: - name: Checkout the repository diff --git a/README.md b/README.md index 800e2d7..ee17da7 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,11 @@ We support version that are not EOL: https://alpinelinux.org/releases/ | Image | OS | Tags | latest | |-------|----|------|--------| -| armhf-base | Alpine | 3.12 3.13 3.14, 3.15 | 3.15 | -| armv7-base | Alpine | 3.12 3.13 3.14, 3.15 | 3.15 | -| aarch64-base | Alpine | 3.12 3.13 3.14, 3.15 | 3.15 | -| amd64-base | Alpine | 3.12 3.13 3.14, 3.15 | 3.15 | -| i386-base | Alpine | 3.12 3.13 3.14, 3.15 | 3.15 | +| armhf-base | Alpine | 3.13 3.14, 3.15, 3.16 | 3.16 | +| armv7-base | Alpine | 3.13 3.14, 3.15, 3.16 | 3.16 | +| aarch64-base | Alpine | 3.13 3.14, 3.15, 3.16 | 3.16 | +| amd64-base | Alpine | 3.13 3.14, 3.15, 3.16 | 3.16 | +| i386-base | Alpine | 3.13 3.14, 3.15, 3.16 | 3.16 | ### jemalloc @@ -29,11 +29,11 @@ We support the latest 3 release with the latest 3 Alpine version. | Image | OS | Tags | latest | |-------|----|------|--------| -| armhf-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine.3.13, 3.8-alpine.3.14, 3.8-alpine.3.15, 3.9-alpine.3.13, 3.9-alpine3.14, 3.9-alpine3.15, 3.10-alpine3.13, 3.10-alpine3.14, 3.10-alpine3.15 | 3.10-alpine.3.15 | -| armv7-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine.3.13, 3.8-alpine.3.14, 3.8-alpine.3.15, 3.9-alpine.3.13, 3.9-alpine3.14, 3.9-alpine3.15, 3.10-alpine3.13, 3.10-alpine3.14, 3.10-alpine3.15 | 3.10-alpine.3.15 | -| aarch64-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine.3.13, 3.8-alpine.3.14, 3.8-alpine.3.15, 3.9-alpine.3.13, 3.9-alpine3.14, 3.9-alpine3.15, 3.10-alpine3.13, 3.10-alpine3.14, 3.10-alpine3.15 | 3.10-alpine.3.15 | -| amd64-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine.3.13, 3.8-alpine.3.14, 3.8-alpine.3.15, 3.9-alpine.3.13, 3.9-alpine3.14, 3.9-alpine3.15, 3.10-alpine3.13, 3.10-alpine3.14, 3.10-alpine3.15 | 3.10-alpine.3.15 | -| i386-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine.3.13, 3.8-alpine.3.14, 3.8-alpine.3.15, 3.9-alpine.3.13, 3.9-alpine3.14, 3.9-alpine3.15, 3.10-alpine3.13, 3.10-alpine3.14, 3.10-alpine3.15 | 3.10-alpine.3.15 | +| armhf-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine3.14, 3.8-alpine3.15, 3.8-alpine3.16, 3.9-alpine3.14, 3.9-alpine3.15, 3.9-alpine3.16, 3.10-alpine3.14, 3.10-alpine3.15, 3.10-alpine3.16 | 3.10-alpine.3.16 | +| armv7-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine3.14, 3.8-alpine3.15, 3.8-alpine3.16, 3.9-alpine3.14, 3.9-alpine3.15, 3.9-alpine3.16, 3.10-alpine3.14, 3.10-alpine3.15, 3.10-alpine3.16 | 3.10-alpine.3.16 | +| aarch64-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine3.14, 3.8-alpine3.15, 3.8-alpine3.16, 3.9-alpine3.14, 3.9-alpine3.15, 3.9-alpine3.16, 3.10-alpine3.14, 3.10-alpine3.15, 3.10-alpine3.16 | 3.10-alpine.3.16 | +| amd64-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine3.14, 3.8-alpine3.15, 3.8-alpine3.16, 3.9-alpine3.14, 3.9-alpine3.15, 3.9-alpine3.16, 3.10-alpine3.14, 3.10-alpine3.15, 3.10-alpine3.16 | 3.10-alpine.3.16 | +| i386-base-python | Alpine | 3.8, 3.9, 3.10, 3.8-alpine3.14, 3.8-alpine3.15, 3.8-alpine3.16, 3.9-alpine3.14, 3.9-alpine3.15, 3.9-alpine3.16, 3.10-alpine3.14, 3.10-alpine3.15, 3.10-alpine3.16 | 3.10-alpine.3.16 | ## Others diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile index 4d1f4be..6f0f64b 100644 --- a/python/3.10/Dockerfile +++ b/python/3.10/Dockerfile @@ -51,6 +51,7 @@ RUN set -ex \ libtirpc-dev \ linux-headers \ make \ + mpdecimal-dev \ ncurses-dev \ pax-utils \ readline-dev \ @@ -75,6 +76,7 @@ RUN set -ex \ --enable-option-checking=fatal \ --enable-shared \ --with-lto \ + --with-system-libmpdec \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \ diff --git a/python/3.9/Dockerfile b/python/3.9/Dockerfile index 4d1f4be..6f0f64b 100644 --- a/python/3.9/Dockerfile +++ b/python/3.9/Dockerfile @@ -51,6 +51,7 @@ RUN set -ex \ libtirpc-dev \ linux-headers \ make \ + mpdecimal-dev \ ncurses-dev \ pax-utils \ readline-dev \ @@ -75,6 +76,7 @@ RUN set -ex \ --enable-option-checking=fatal \ --enable-shared \ --with-lto \ + --with-system-libmpdec \ --with-system-expat \ --with-system-ffi \ --without-ensurepip \