From 3fa46a4e09a540201d68d4e09df6f6e763591293 Mon Sep 17 00:00:00 2001 From: renovate Date: Fri, 18 Dec 2020 01:06:19 +0000 Subject: [PATCH 1/2] Update vault Docker tag to v1.6.1 --- Dockerfile | 4 ++-- Jenkinsfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4623a8d..24a2bf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io ARG BASE_IMAGE=ubi8 ARG BASE_TAG=8.2 -FROM vault:1.6.0 AS source +FROM vault:1.6.1 AS source FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -10,7 +10,7 @@ LABEL org.opencontainers.image.title="vault" \ org.opencontainers.image.description="Vault is a tool for securely accessing secrets." \ org.opencontainers.image.licenses="MPL-2.0" \ org.opencontainers.image.url="https://www.vaultproject.io/" \ - org.opencontainers.image.version="1.6.0" \ + org.opencontainers.image.version="1.6.1" \ maintainer="cht@dsop.io" COPY --from=source /bin/vault /bin/vault diff --git a/Jenkinsfile b/Jenkinsfile index c5df20e..6b36ee5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "1.6.0") +dccscrPipeline(version: "1.6.1") -- GitLab From 75ffec8a8e45bd181566f13663a8892b64dbf6e7 Mon Sep 17 00:00:00 2001 From: "shen_vickie@bah.com" Date: Fri, 18 Dec 2020 19:25:35 -0500 Subject: [PATCH 2/2] updated tag version --- Dockerfile | 1 - hardening_manifest.yaml | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index cb10575..90ad177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,6 @@ FROM vault:1.6.1 AS source FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} - COPY --from=source /bin/vault /bin/vault COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 45a0109..09136db 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,7 +8,7 @@ name: "hashicorp/vault/vault" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "1.6.0" +- "1.6.1" - "latest" # Build args passed to Dockerfile ARGs @@ -27,7 +27,7 @@ labels: org.opencontainers.image.url: "https://www.vaultproject.io/" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Hashicorp" - org.opencontainers.image.version: "1.6.0" + org.opencontainers.image.version: "1.6.1" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "opensource" ## This value can be "opensource" or "commercial" @@ -37,8 +37,8 @@ labels: # List of resources to make available to the offline build context resources: -- tag: vault:1.6.0 - url: docker://docker.io/library/vault@sha256:b04266db3e7ece92690df720fcf98ecf138a92ed3d1edc14dc86fe814c33ab9b +- tag: vault:1.6.1 + url: docker://docker.io/library/vault@sha256:e2fedbd8dadb71d909c7f989c8182b82052107aeb09f62ec18e5fb24fc622c53 # List of project maintainers maintainers: -- GitLab