diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f8909eb5b..c6ba09c74 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-go@v4 name: Set up Go 1.x with: - go-version: "1.21.9" + go-version: "1.22.7" env: GO111MODULE: off diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 8d04ae255..c6666280d 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -14,9 +14,9 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/setup-go@v4 - name: Set up golang 1.21 + name: Set up golang 1.22.7 with: - go-version: '1.21.9' + go-version: '1.22.7' - name: Check out source code uses: actions/checkout@v2 - name: Run Tests diff --git a/.github/workflows/platsec.yml b/.github/workflows/platsec.yml index 543b66078..5713a32b3 100644 --- a/.github/workflows/platsec.yml +++ b/.github/workflows/platsec.yml @@ -34,11 +34,3 @@ jobs: ## the defaults of root '.' for the path and 'Dockerfile' for the Dockerfile name. ## Additionally, if you have a Dockerfile you use as your BASE_IMG or you need to ## use '--build-arg', those can be define below as well. - - with: - # dockerfile_path: './test' - # dockerfile_name: 'Dockerfile.main' - base_image_build: true - # base_dockerfile_path: './test' - base_dockerfile_name: 'Dockerfile.base' - build_arg: '--build-arg BASE_IMAGE="localbuild/baseimage:latest"' diff --git a/Dockerfile b/Dockerfile index 1b1175963..57eaf41f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/go-toolset:1.21.11-8.1724662611 as builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.22.7-5.1731464728 as builder USER 0 ENV GOSUMDB=off @@ -30,7 +30,7 @@ RUN CGO_ENABLED=1 GOOS=linux GO111MODULE=on go build -o manager main.go # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1086 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1130 WORKDIR / COPY --from=builder /workspace/manager . COPY --from=builder /workspace/manifest.yaml .