diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 0d434ac..61886a1 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@v6 + uses: actions/checkout@v7 - 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 fb67c20..ea01f0a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -50,19 +50,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -70,7 +70,7 @@ jobs: - name: Build and export id: docker_export - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: file: ./${{ matrix.debian }}/Dockerfile build-args: | @@ -86,7 +86,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.debian }}/Dockerfile @@ -116,7 +116,7 @@ jobs: name: Build and push default tags id: docker_build_default if: matrix.debian == '13' - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.debian }}/Dockerfile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cbf80f9..d30e176 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -52,19 +52,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -72,7 +72,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: ./${{ matrix.debian }}/Dockerfile @@ -106,7 +106,7 @@ jobs: - name: Build and push default tags id: docker_build_default - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 if: matrix.debian == '13' with: context: . diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7153006..31e6472 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,10 +15,10 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/12/Dockerfile b/12/Dockerfile index 59a1e27..18e5b32 100644 --- a/12/Dockerfile +++ b/12/Dockerfile @@ -37,7 +37,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v3.2.2 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v3.2.4 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / diff --git a/13/Dockerfile b/13/Dockerfile index daea7c3..2f0602c 100644 --- a/13/Dockerfile +++ b/13/Dockerfile @@ -37,7 +37,7 @@ WORKDIR /tmp RUN \ # get the overlay from the Alpine base image echo "Cloning Alpine overlay." && \ - apk add git && git clone --branch v3.2.2 https://github.com/bfren/docker-alpine.git && \ + apk add git && git clone --branch v3.2.4 https://github.com/bfren/docker-alpine.git && \ mv docker-alpine/overlay / diff --git a/VERSION b/VERSION index 63f23b1..40dc926 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.14 \ No newline at end of file +5.1.15 \ No newline at end of file diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index 1adbf88..c1082da 100755 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -ALPINE_BRANCH="v3.2.2" +ALPINE_BRANCH="v3.2.4" BUSYBOX_VERSION="1.36.1" BUSYBOX_BUILD="260128" NU_VERSION="0.114.1"