diff --git a/Dockerfile b/Dockerfile index 5d8751afc78de3410a3b335d83c37fda8dd153d6..316aadde675104f0508be9ba675529e00d79e78d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.6.3-ubi8 +ARG GITLAB_VERSION=v13.7.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.6.3 +ARG BASE_TAG=13.7.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index d0a34251c8a85a021d4ba9d080c2766abcf9452c..0000000000000000000000000000000000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "13.6.3") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 791fcf36e223a4191c521424c52a280412f786a7..1d20f3f7d2b756772509218e6e58febedc397b76 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.6.3} +TAG=${1:-13.7.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml deleted file mode 100644 index c7449ca787035229fb32736be9b8b0a33ee10af9..0000000000000000000000000000000000000000 --- a/download.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-rails-ee.tar.gz" - filename: "gitlab-rails-ee.tar.gz" - validation: - type: "sha256" - value: "74ee61a14ae796d2882111d8ce6c9abcd60cbb40209651786a23b84881f9a0fb" diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000000000000000000000000000000000000..449a8cc92c6f4024cc899a10fc243905e11f914c --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,59 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "gitlab/gitlab/gitlab-rails" + +# 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: +- "13.7.0" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" + BASE_TAG: "13.7.0" + +# Docker image labels +labels: + org.opencontainers.image.title: "Gitlab Rails" + ## Human-readable description of the software packaged in the image + org.opencontainers.image.description: "Rails container for GitLab." + ## License(s) under which contained software is distributed + org.opencontainers.image.licenses: "MIT License" + ## URL to find more information on the image + org.opencontainers.image.url: "https://about.gitlab.com/" + ## Name of the distributing entity, organization or individual + org.opencontainers.image.vendor: "Gitlab" + org.opencontainers.image.version: "13.7.0" + ## Keywords to help with search (ex. "cicd,gitops,golang") + mil.dso.ironbank.image.keywords: "gitlab, git, gitops" + ## This value can be "opensource" or "commercial" + mil.dso.ironbank.image.type: "commercial" + ## Product the image belongs to for grouping multiple images + mil.dso.ironbank.product.name: "gitlab" + + +# List of resources to make available to the offline build context +resources: +- filename: gitlab-rails-ee.tar.gz + url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitlab-rails-ee.tar.gz + validation: + type: sha256 + value: 91d5a68a86f2568efa5819af2435368ba955342d0c27a33699bf924ddce7eb9f + +# List of project maintainers +# FIXME: Fill in the following details for the current container owner in the whitelist +# FIXME: Include any other vendor information if applicable +maintainers: +- email: "dj@gitlab.com " +# # The name of the current container owner + name: "DJ Mountney" +# # The gitlab username of the current container owner + username: "twk3" +# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT +- name: "Al Fontaine" + username: "alfontaine" + email: "alan.fontaine@centauricorp.com"