diff --git a/Dockerfile b/Dockerfile index 219a22d49c54617c77558eea2c7dc0ec61acebee..bc11d19ea3d5c4b683d1298b11aaf5843bfa1e2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.7.4-ubi8 +ARG GITLAB_VERSION=v13.8.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.7.4 +ARG BASE_TAG=13.8.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index a6684abcf1885213412d8d21db1f784ac1987a48..1a6e484ff4876f8e3e70fe11cab7e340b7763b6a 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.7.4} +TAG=${1:-13.8.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 013bc1035fae12acd1e61ecbdd41d71de6c645d8..2e2f30d31a14d24c7b56fa0c1fc2a10e3c7c28c4 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -1,21 +1,16 @@ ---- apiVersion: v1 - # The repository name in registry1, excluding /ironbank/ name: "gitlab/gitlab/git-base" - # 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.4" -- "latest" - + - "13.8.0" + - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.7.4" - + BASE_TAG: "13.8.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Git-Base" @@ -27,33 +22,29 @@ labels: 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.4" + org.opencontainers.image.version: "13.8.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: git-base.tar.gz - url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.4-ubi8/git-base.tar.gz - validation: - type: sha256 - value: ca2a496a0848cf6e0f45d74c3c5eccc823fd72087335e8559a422749aa3826dc - # 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" + - 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" +resources: + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.8.0-ubi8/git-base.tar.gz" + filename: "git-base.tar.gz" + validation: + type: "sha256" + value: "2dae72541af50e03fc2094011a5e3c7f5ff4440d6ba6e2767361e8bed415ce7a"