diff --git a/.builder-image-version.txt b/.builder-image-version.txt index be5b4c7bb..6f1824254 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.20 +1.1.21 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 66f6b2858..d5c5b726c 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -21,7 +21,7 @@ jobs: if: github.event_name != 'pull_request' || !github.event.pull_request.draft runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.20 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.21 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml index a84565ace..dfe982c1c 100644 --- a/.github/workflows/schedule-scan-image.yml +++ b/.github/workflows/schedule-scan-image.yml @@ -9,7 +9,7 @@ jobs: name: Trivy runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.20 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.21 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/images/cso/Dockerfile b/images/cso/Dockerfile index b82c6315f..3938590c6 100644 --- a/images/cso/Dockerfile +++ b/images/cso/Dockerfile @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=${BUILDPLATFORM} docker.io/alpine/helm:3.15.1 as helm +FROM --platform=${BUILDPLATFORM} docker.io/alpine/helm:3.16.2 as helm # Build the manager binary -FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.23.0-bullseye as build +FROM --platform=${BUILDPLATFORM} docker.io/library/golang:1.23.2-bullseye as build ARG TARGETOS TARGETARCH COPY . /src/cluster-stack-operator @@ -25,7 +25,7 @@ RUN --mount=type=cache,target=/root/.cache --mount=type=cache,target=/go/pkg \ go build -mod=vendor -ldflags "${LDFLAGS} -extldflags '-static'" \ -o manager cmd/main.go -FROM --platform=${BUILDPLATFORM} docker.io/library/alpine:3.20.0 +FROM --platform=${BUILDPLATFORM} docker.io/library/alpine:3.20.3 WORKDIR / COPY --from=build /src/cluster-stack-operator/manager . COPY --from=helm --chown=root:root --chmod=755 /usr/bin/helm /usr/local/bin/helm