diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 54c3776..0d434ac 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Create Pull Request run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 660a582..71c4edd 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -43,12 +43,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to GitHub Container Registry + name: Login to Quay.io Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io + registry: quay.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.QUAY_TOKEN }} - name: Build and export id: docker_export @@ -80,8 +80,8 @@ jobs: tags: | bfren/node:node${{ matrix.node }}-dev bfren/node:node${{ matrix.node }}-${{ steps.version.outputs.contents }}-dev - ghcr.io/bfren/node:node${{ matrix.node }}-dev - ghcr.io/bfren/node:node${{ matrix.node }}-${{ steps.version.outputs.contents }}-dev + quay.io/bfren/node:node${{ matrix.node }}-dev + quay.io/bfren/node:node${{ matrix.node }}-${{ steps.version.outputs.contents }}-dev - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 189abdf..880cddf 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -57,12 +57,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to GitHub Container Registry + name: Login to Quay.io Container Registry uses: docker/login-action@v3 with: - registry: ghcr.io + registry: quay.io username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.QUAY_TOKEN }} - name: Build and push id: docker_build @@ -83,12 +83,12 @@ jobs: bfren/node:node${{ matrix.node }}-${{ steps.version.outputs.contents }} bfren/node:node${{ steps.node_minor.outputs.contents }} bfren/node:node${{ steps.node_minor.outputs.contents }}-${{ steps.version.outputs.contents }} - ghcr.io/bfren/node:node${{ matrix.node }} - ghcr.io/bfren/node:node${{ matrix.node }}-${{ steps.version_major.outputs.contents }} - ghcr.io/bfren/node:node${{ matrix.node }}-${{ steps.version_minor.outputs.contents }} - ghcr.io/bfren/node:node${{ matrix.node }}-${{ steps.version.outputs.contents }} - ghcr.io/bfren/node:node${{ steps.node_minor.outputs.contents }} - ghcr.io/bfren/node:node${{ steps.node_minor.outputs.contents }}-${{ steps.version.outputs.contents }} + quay.io/bfren/node:node${{ matrix.node }} + quay.io/bfren/node:node${{ matrix.node }}-${{ steps.version_major.outputs.contents }} + quay.io/bfren/node:node${{ matrix.node }}-${{ steps.version_minor.outputs.contents }} + quay.io/bfren/node:node${{ matrix.node }}-${{ steps.version.outputs.contents }} + quay.io/bfren/node:node${{ steps.node_minor.outputs.contents }} + quay.io/bfren/node:node${{ steps.node_minor.outputs.contents }}-${{ steps.version.outputs.contents }} - name: Build and push default id: docker_build_default @@ -106,8 +106,8 @@ jobs: tags: | bfren/node:latest bfren/node:${{ steps.version.outputs.contents }} - ghcr.io/bfren/node:latest - ghcr.io/bfren/node:${{ steps.version.outputs.contents }} + quay.io/bfren/node:latest + quay.io/bfren/node:${{ steps.version.outputs.contents }} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7fc7506..4e5b4a9 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,7 +15,7 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Login to DockerHub uses: docker/login-action@v3 diff --git a/16/Dockerfile b/16/Dockerfile index b150557..1862149 100644 --- a/16/Dockerfile +++ b/16/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.16-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.16-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/17/Dockerfile b/17/Dockerfile index 8df9c57..9c75f9c 100644 --- a/17/Dockerfile +++ b/17/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.15-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.15-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/18/Dockerfile b/18/Dockerfile index c1f1bb9..ec29d0e 100644 --- a/18/Dockerfile +++ b/18/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.18-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.18-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/19/Dockerfile b/19/Dockerfile index 4dc3c83..b6e74e4 100644 --- a/19/Dockerfile +++ b/19/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.17-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.17-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/20/Dockerfile b/20/Dockerfile index ed5895e..1bce0b5 100644 --- a/20/Dockerfile +++ b/20/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/21/Dockerfile b/21/Dockerfile index 8d9ac54..f9d685b 100644 --- a/21/Dockerfile +++ b/21/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.20-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.20-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/22/Dockerfile b/22/Dockerfile index c0dbd11..4b4ab1a 100644 --- a/22/Dockerfile +++ b/22/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/22/overlay/tmp/NPM_BUILD b/22/overlay/tmp/NPM_BUILD index c927e67..f3aaee3 100644 --- a/22/overlay/tmp/NPM_BUILD +++ b/22/overlay/tmp/NPM_BUILD @@ -1 +1 @@ -11.3.0-r1 \ No newline at end of file +11.6.3-r0 \ No newline at end of file diff --git a/23/Dockerfile b/23/Dockerfile index 0382ce7..72d1635 100644 --- a/23/Dockerfile +++ b/23/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine3.22-5.6.7 +FROM quay.io/bfren/alpine-s6:alpine3.22-6.0.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/23/overlay/tmp/NPM_BUILD b/23/overlay/tmp/NPM_BUILD index c927e67..f3aaee3 100644 --- a/23/overlay/tmp/NPM_BUILD +++ b/23/overlay/tmp/NPM_BUILD @@ -1 +1 @@ -11.3.0-r1 \ No newline at end of file +11.6.3-r0 \ No newline at end of file diff --git a/Dockerfile.esh b/Dockerfile.esh index 4bdc1bc..8c74df9 100644 --- a/Dockerfile.esh +++ b/Dockerfile.esh @@ -1,4 +1,4 @@ -FROM ghcr.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %> +FROM quay.io/bfren/alpine-s6:alpine<%= ${ALPINE_EDITION} %>-<%= ${BASE_VERSION} %> LABEL org.opencontainers.image.source="https://github.com/bfren/docker-node" diff --git a/VERSION b/VERSION index 3ec370e..0c89fc9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.4.5 \ No newline at end of file +4.0.0 \ No newline at end of file diff --git a/VERSION_MAJOR b/VERSION_MAJOR index e440e5c..bf0d87a 100644 --- a/VERSION_MAJOR +++ b/VERSION_MAJOR @@ -1 +1 @@ -3 \ No newline at end of file +4 \ No newline at end of file diff --git a/VERSION_MINOR b/VERSION_MINOR index af1817b..389f774 100644 --- a/VERSION_MINOR +++ b/VERSION_MINOR @@ -1 +1 @@ -3.4 \ No newline at end of file +4.0 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 2a412c3..f01dfe0 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_VERSION="5.6.7" +BASE_VERSION="6.0.1" echo "Base: ${BASE_VERSION}" NODE_VERSIONS="16 17 18 19 20 21 22 23"