diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e14e05f607..d5fb9defbd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - BASE: ["18-bullseye-full", "18-bullseye-lite", "18-bullseye-thin"] + BASE: ["18-bookworm-full", "18-bookworm-lite", "18-bookworm-thin"] SUPERVISOR: ["", ".s6"] steps: - name: Check out the repo @@ -66,19 +66,19 @@ jobs: push: true tags: | ${{ format('koush/scrypted:{0}{1}-v{2}', matrix.BASE, matrix.SUPERVISOR, github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }} - ${{ matrix.BASE == '18-bullseye-full' && matrix.SUPERVISOR == '.s6' && format('koush/scrypted:{0}', github.event.inputs.tag) || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-full' && matrix.SUPERVISOR == '' && 'koush/scrypted:full' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-lite' && matrix.SUPERVISOR == '' && 'koush/scrypted:lite' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-thin' && matrix.SUPERVISOR == '' && 'koush/scrypted:thin' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-lite' && matrix.SUPERVISOR == '.s6' && 'koush/scrypted:lite-s6' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-thin' && matrix.SUPERVISOR == '.s6' && 'koush/scrypted:thin-s6' || '' }} + ${{ matrix.BASE == '18-bookworm-full' && matrix.SUPERVISOR == '.s6' && format('koush/scrypted:{0}', github.event.inputs.tag) || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-full' && matrix.SUPERVISOR == '' && 'koush/scrypted:full' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-lite' && matrix.SUPERVISOR == '' && 'koush/scrypted:lite' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-thin' && matrix.SUPERVISOR == '' && 'koush/scrypted:thin' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-lite' && matrix.SUPERVISOR == '.s6' && 'koush/scrypted:lite-s6' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-thin' && matrix.SUPERVISOR == '.s6' && 'koush/scrypted:thin-s6' || '' }} ${{ format('ghcr.io/koush/scrypted:{0}{1}-v{2}', matrix.BASE, matrix.SUPERVISOR, github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }} - ${{ matrix.BASE == '18-bullseye-full' && matrix.SUPERVISOR == '.s6' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.tag) || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-full' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:full' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-lite' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:lite' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-thin' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:thin' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-lite' && matrix.SUPERVISOR == '.s6' && 'ghcr.io/koush/scrypted:lite-s6' || '' }} - ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bullseye-thin' && matrix.SUPERVISOR == '.s6' && 'ghcr.io/koush/scrypted:thin-s6' || '' }} + ${{ matrix.BASE == '18-bookworm-full' && matrix.SUPERVISOR == '.s6' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.tag) || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-full' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:full' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-lite' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:lite' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-thin' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:thin' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-lite' && matrix.SUPERVISOR == '.s6' && 'ghcr.io/koush/scrypted:lite-s6' || '' }} + ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '18-bookworm-thin' && matrix.SUPERVISOR == '.s6' && 'ghcr.io/koush/scrypted:thin-s6' || '' }} cache-from: type=gha cache-to: type=gha,mode=max diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full index 3a12ec44fa..cfc065be36 100644 --- a/install/docker/Dockerfile.full +++ b/install/docker/Dockerfile.full @@ -81,6 +81,7 @@ RUN if [ "$(uname -m)" != "x86_64" ]; \ fi # python pip +RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED RUN python3 -m pip install --upgrade pip # pyvips is broken on x86 due to mismatch ffi # https://stackoverflow.com/questions/62658237/it-seems-that-the-version-of-the-libffi-library-seen-at-runtime-is-different-fro diff --git a/install/docker/docker-build.sh b/install/docker/docker-build.sh index e3a3161ee1..b8bd921bd6 100755 --- a/install/docker/docker-build.sh +++ b/install/docker/docker-build.sh @@ -3,7 +3,7 @@ set -x NODE_VERSION=18 -BUILDPACK_DEPS_BASE=bullseye +BUILDPACK_DEPS_BASE=bookworm FLAVOR=full BASE=$NODE_VERSION-$BUILDPACK_DEPS_BASE-$FLAVOR echo $BASE diff --git a/install/docker/template/Dockerfile.full.header b/install/docker/template/Dockerfile.full.header index 331ac2b42f..dbed76f5ee 100644 --- a/install/docker/template/Dockerfile.full.header +++ b/install/docker/template/Dockerfile.full.header @@ -78,6 +78,7 @@ RUN if [ "$(uname -m)" != "x86_64" ]; \ fi # python pip +RUN rm -f /usr/lib/python**/EXTERNALLY-MANAGED RUN python3 -m pip install --upgrade pip # pyvips is broken on x86 due to mismatch ffi # https://stackoverflow.com/questions/62658237/it-seems-that-the-version-of-the-libffi-library-seen-at-runtime-is-different-fro