diff --git a/Dockerfile b/Dockerfile index cafc7c2c9765eb019f655d958a2d24e1bab49f30..10a4cc2c62729d2e241cb180bc885e087ba7ecfb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_TAG=8.6 -FROM registry1.dso.mil/ironbank/google/golang:1.17.13 as build +FROM registry1.dso.mil/ironbank/google/golang/golang-1.18:1.18.6 as build USER root @@ -40,13 +40,13 @@ FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} COPY tini-amd64 /sbin/tini COPY gpg/RPM-GPG-KEY-EPEL-8 libssh2.rpm / COPY --from=build /go/src/github.com/fluxcd/source-controller/source-controller /usr/local/bin/ -COPY --from=build /lib64/libgit2.so.1.3.1 /lib64/libgit2.so.1.3.1 +COPY --from=build /lib64/libgit2.so.1.3.2 /lib64/libgit2.so.1.3.2 RUN groupadd controller \ && useradd -g controller -m controller \ && chmod +x /sbin/tini \ - && ln -s /lib64/libgit2.so.1.3.1 /lib64/libgit2.so.1.3 \ - && ln -s /lib64/libgit2.so.1.3.1 /lib64/libgit2.so \ + && ln -s /lib64/libgit2.so.1.3.2 /lib64/libgit2.so.1.3 \ + && ln -s /lib64/libgit2.so.1.3.2 /lib64/libgit2.so \ && rpm --import /RPM-GPG-KEY-EPEL-8 \ && dnf install -y /libssh2.rpm \ && dnf clean all \ diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 9361e80eb8600834d8694741d2a197e1c6d6b3fd..e8af8ce1077890d486a68c330edf1a0ec133f8a4 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -3,7 +3,7 @@ apiVersion: v1 name: fluxcd/source-controller tags: -- v0.27.0 +- v0.28.0 - latest args: @@ -17,22 +17,22 @@ labels: org.opencontainers.image.licenses: Apache-2.0 org.opencontainers.image.url: https://github.com/fluxcd/source-controller org.opencontainers.image.vendor: fluxcd - org.opencontainers.image.version: v0.27.0 + org.opencontainers.image.version: v0.28.0 mil.dso.ironbank.image.keywords: gitops,kubernetes mil.dso.ironbank.image.type: opensource mil.dso.ironbank.product.name: fluxcd resources: - filename: source-controller.tar.gz - url: https://github.com/fluxcd/source-controller/archive/refs/tags/v0.25.11.tar.gz + url: https://github.com/fluxcd/source-controller/archive/refs/tags/v0.28.0.tar.gz validation: type: sha256 - value: ca3da36984b4080027425c2a6c33bdd3a7118c47f975737e43147999be30662c + value: d67850f1446cb3486c9eab577fa981e3efe275d1f183eeb57e7b267d50ce0cc0 - filename: libgit2.tar.gz - url: https://github.com/libgit2/libgit2/archive/refs/tags/v1.3.1.tar.gz + url: https://github.com/libgit2/libgit2/archive/refs/tags/v1.3.2.tar.gz validation: type: sha256 - value: a2a0a90d577f1771ba9f7e98042865c3f6386c896eeefa846c3fc0c37ce7c6e0 + value: 3a4469b32b73d53f9dbb7bf17b61b0cfb7dae9020e199f928fa96f12d6eb29cb - filename: tini-amd64 url: https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd64 validation: