From 3700c0225afe3efe7ecc938593aa2f86bf61fc75 Mon Sep 17 00:00:00 2001 From: James Strong Date: Mon, 11 Dec 2023 21:16:59 -0500 Subject: [PATCH] update images from golang upgrade Signed-off-by: James Strong --- .github/workflows/ci.yaml | 16 ++++++++-------- images/nginx/rootfs/Dockerfile | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bfba95cf4..327dc15d5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -73,9 +73,9 @@ jobs: - name: Set up Go id: go - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21.1' + go-version: '1.21.5' check-latest: true - name: Run test @@ -94,9 +94,9 @@ jobs: - name: Set up Go id: go - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21.1' + go-version: '1.21.5' check-latest: true - name: Set up QEMU @@ -158,9 +158,9 @@ jobs: uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Setup Go - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21.1' + go-version: '1.21.5' check-latest: true - name: cache @@ -465,9 +465,9 @@ jobs: - name: Set up Go id: go if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }} - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: - go-version: '1.21.1' + go-version: '1.21.5' check-latest: true - name: kube-webhook-certgen image build diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile index d5cd8c143..4aea7843b 100644 --- a/images/nginx/rootfs/Dockerfile +++ b/images/nginx/rootfs/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.18.2 as builder +FROM alpine:3.19.0 as builder COPY . / @@ -21,7 +21,7 @@ RUN apk update \ && /build.sh # Use a multi-stage build -FROM alpine:3.18.2 +FROM alpine:3.19.0 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin