From 8744084d57aab44c4d4f3fbe74ebb3ee1bbf6e5a Mon Sep 17 00:00:00 2001 From: achsahabraham <abraham_achsah@bah.com> Date: Wed, 13 Apr 2022 11:27:30 -0400 Subject: [PATCH 1/4] update to 0.23.0 --- hardening_manifest.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 1dbe7342..a7956529 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -3,7 +3,7 @@ apiVersion: v1 name: fluxcd/source-controller tags: -- v0.22.5 +- v0.23.0 - latest args: @@ -17,17 +17,17 @@ 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.22.5 + org.opencontainers.image.version: v0.23.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.22.5.tar.gz + url: https://github.com/fluxcd/source-controller/archive/refs/tags/v0.23.0.tar.gz validation: type: sha256 - value: eed1d8b248b701c55d775a341da5af7aecc9c6cc40e9c01aa69fd22bc53201a8 + value: 0d0ead5d36c84b42bbe3bdcec81c11965f61b1c9f2d674aba0b44c7e788aabe9 - filename: libgit2.tar.gz url: https://github.com/libgit2/libgit2/archive/refs/tags/v1.3.0.tar.gz validation: -- GitLab From d3dfd3d91ea3d1c946b8599700ebe1304e5ee4eb Mon Sep 17 00:00:00 2001 From: achsahabraham <abraham_achsah@bah.com> Date: Wed, 13 Apr 2022 11:32:24 -0400 Subject: [PATCH 2/4] achsah-fixes --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index a7956529..df77b60e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -27,7 +27,7 @@ resources: url: https://github.com/fluxcd/source-controller/archive/refs/tags/v0.23.0.tar.gz validation: type: sha256 - value: 0d0ead5d36c84b42bbe3bdcec81c11965f61b1c9f2d674aba0b44c7e788aabe9 + value: 2e75b8d790909c3b37567c99b55d7e27f07189aa9ee4df856fb0f4b5fd6f3e65 - filename: libgit2.tar.gz url: https://github.com/libgit2/libgit2/archive/refs/tags/v1.3.0.tar.gz validation: -- GitLab From 5ad5d8fe25cb2137b9eb0bab7263fe304f50303e Mon Sep 17 00:00:00 2001 From: achsahabraham <abraham_achsah@bah.com> Date: Wed, 13 Apr 2022 12:13:06 -0400 Subject: [PATCH 3/4] update --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9677ef9d..5f8d147a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,7 @@ RUN groupadd controller \ && dnf update -y \ && dnf install -y /libssh2.rpm \ && dnf clean all \ + && dnf clean packages \ && rm -rf /var/cache/dnf /libssh2.rpm USER controller -- GitLab From 74be2df186dd09a0348a508d2f884c182f76d0da Mon Sep 17 00:00:00 2001 From: achsahabraham <abraham_achsah@bah.com> Date: Wed, 13 Apr 2022 15:10:56 -0400 Subject: [PATCH 4/4] update --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f8d147a..48dfb2aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,11 +48,12 @@ RUN groupadd controller \ && ln -s /lib64/libgit2.so.1.3.0 /lib64/libgit2.so.1.3 \ && ln -s /lib64/libgit2.so.1.3.0 /lib64/libgit2.so \ && rpm --import /RPM-GPG-KEY-EPEL-8 \ - && dnf update -y \ && dnf install -y /libssh2.rpm \ && dnf clean all \ - && dnf clean packages \ - && rm -rf /var/cache/dnf /libssh2.rpm + && rm -rf /var/cache/dnf /libssh2.rpm \ + && dnf upgrade -y \ + && dnf update -y + USER controller HEALTHCHECK none -- GitLab