diff --git a/Dockerfile b/Dockerfile index 06f11cccb31b091ebf33c39188c9ce5e07dd6292..41c881e19ad903d6adcd0adb22b2beb7d6bd85d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,12 @@ -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 ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} +FROM vault:1.6.2 AS source -LABEL org.opencontainers.image.title="hashicorp/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" \ - maintainer="rel-eng@hashicorp.com" +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -COPY vault.zip /tmp +COPY --from=source /bin/vault /bin/vault COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN unzip -d /bin /tmp/vault.zip && \ @@ -24,11 +19,11 @@ RUN unzip -d /bin /tmp/vault.zip && \ 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 c5df20e110e0f7d0eb9829b3fc48bcc691076f0f..0000000000000000000000000000000000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,3 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "1.6.0") - diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c39f75c9f4cd1843b386014d4e3557c3853e14a0 --- /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.2" +- "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.2" + ## 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.2 + url: docker://docker.io/library/vault@sha256:3891ca2e808582c37ff79c661ec9924ae062014de01c4c663a636967d994b646 + +# 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 99950ea3fdc0025ddaec04a121a798b3b0ca1baf..f281d7b678c451e98a0cdae2f4faefb94ff00e0e 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": "hashicorp/vault", "datasourceTemplate": "docker" } ] -} +} \ No newline at end of file