diff --git a/Dockerfile b/Dockerfile index 24a2bf782a72bec1b9b1cdfc9046f888fbfabddd..cb10575f19bd52656b3521c77e28121de77bf7e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,11 @@ -ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io +ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ubi8 -ARG BASE_TAG=8.2 +ARG BASE_TAG=8.3 FROM vault:1.6.1 AS source FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -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.1" \ - maintainer="cht@dsop.io" COPY --from=source /bin/vault /bin/vault COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh @@ -23,11 +17,11 @@ RUN groupadd -g 1001 vault && \ mkdir -p /vault/config && \ chown -R vault:vault /vault -EXPOSE 8200 +EXPOSE 8200 USER vault HEALTHCHECK --interval=5m --timeout=30s --start-period=1m --retries=3 \ - CMD curl -f http://locahost:8200/v1/sys/health?standbyok=true || exit 1 + CMD curl -f http://locahost:8200/v1/sys/health?standbyok=true || exit 1 ENTRYPOINT ["docker-entrypoint.sh"] CMD ["server"] diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 6b36ee5c14edb60e1dab3669ceb4711b2ca32354..0000000000000000000000000000000000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,3 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "1.6.1") - diff --git a/download.yaml b/download.yaml deleted file mode 100644 index c1721575babe46d96574c34965c088fcb9dd42ba..0000000000000000000000000000000000000000 --- a/download.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resources: - - url: "docker://docker.io/library/vault@sha256:b04266db3e7ece92690df720fcf98ecf138a92ed3d1edc14dc86fe814c33ab9b" - tag: "vault:1.6.0" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..45a0109b95d26413746b82064acc5a446cdbc5c7 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,50 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "hashicorp/vault/vault" + +# List of tags to push for the repository in registry1 +# The most specific version should be the first tag and will be shown +# on ironbank.dsop.io +tags: +- "1.6.0" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "redhat/ubi/ubi8" + BASE_TAG: "8.3" + +# Docker image labels +labels: + org.opencontainers.image.title: "vault" + ## Human-readable description of the software packaged in the image + org.opencontainers.image.description: "Vault is a tool for securely accessing secrets." + ## License(s) under which contained software is distributed + org.opencontainers.image.licenses: "MPL-2.0" + ## URL to find more information on the image + 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" + ## Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "opensource" + ## This value can be "opensource" or "commercial" + mil.dso.ironbank.image.type: "opensource" + ## Product the image belongs to for grouping multiple images + mil.dso.ironbank.product.name: "Apache vault" + +# 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 + +# List of project maintainers +maintainers: +- email: "shen_vickie@bah.com" +# # The name of the current container owner + name: "Vickie Shen" +# # The gitlab username of the current container owner + username: "shen_vickie" + cht_member: true diff --git a/renovate.json b/renovate.json index 102a92824c737a6002eba98646a3e9cdfdbffb77..6435ed2269a46b57e0187adadd5c7c5eb0e83194 100644 --- a/renovate.json +++ b/renovate.json @@ -1,9 +1,15 @@ { - "assignees": ["@sean.melissari"], - "baseBranches": ["development"], + "assignees": [ + "@sean.melissari" + ], + "baseBranches": [ + "development" + ], "regexManagers": [ { - "fileMatch": ["^Dockerfile$"], + "fileMatch": [ + "^Dockerfile$" + ], "matchStrings": [ "version=\"(?.*?)\"" ], @@ -11,12 +17,24 @@ "datasourceTemplate": "docker" }, { - "fileMatch": ["^Jenkinsfile$"], + "fileMatch": [ + "^hardening_manifest.yaml$" + ], + "matchStrings": [ + "org\\.opencontainers\\.image\\.version:\\s+\"(?.+?)\"" + ], + "depNameTemplate": "vault", + "datasourceTemplate": "docker" + }, + { + "fileMatch": [ + "^hardening_manifest.yaml$" + ], "matchStrings": [ - "version:\\s+\"(?.*?)\"" + "tags:\\s+-\\s+\"(?.+?)\"" ], "depNameTemplate": "vault", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file