diff --git a/Dockerfile b/Dockerfile index 0f807b450d351d7c413d8201fbb76a0aaa6b386c..d3ccd21998dc14cc72b16e5d4cbda10fa49fc168 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.10.3-ubi8 +ARG GITLAB_VERSION=v13.11.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/git-base -ARG BASE_TAG=13.10.3 +ARG BASE_TAG=13.11.0 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v13.10.3 +ARG GITALY_SERVER_VERSION=v13.11.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 9e0c97c173506aee02d4fc681fda9a6ab0bb71af..f8dec75629f193a3aa297ed7c7eb175ea40e9a4f 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.10.3} +TAG=${1:-13.11.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 2abfa064e94e6ca27ca87cccafc8f7dc3b185dd7..5b2afd0885c43110d743c82ce14550abbd173158 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitaly" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "13.10.3" + - "13.11.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/git-base" - BASE_TAG: "13.10.3" + BASE_TAG: "13.11.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Gitaly" @@ -22,7 +22,7 @@ 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.10.3" + org.opencontainers.image.version: "13.11.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" @@ -43,8 +43,8 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.3-ubi8/gitaly.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "829b1d98fd90a59138a28641a52d6eb2c8df3388de69038e2da492940d3200d9" + value: "1c93d590a75b0311ccd45b8dbcee26203992e1b26e6674cab0a50bc5550bba40" diff --git a/openshift.metadata b/openshift.metadata new file mode 100644 index 0000000000000000000000000000000000000000..e7cd51e649c6cd988a101c7278cc7fc3a19d0097 --- /dev/null +++ b/openshift.metadata @@ -0,0 +1,6 @@ +io.openshift.tags=gitlab-gitaly +io.openshift.wants=gitlab-webservice +io.k8s.description=GitLab Gitaly service container. +io.openshift.non-scalable=false +io.openshift-min-memory=200Mi +io.openshift.min-cpu=100m diff --git a/trufflehog-config.yaml b/trufflehog-config.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7a462a0a982db5c09fd48abab869c2d436bc21cb --- /dev/null +++ b/trufflehog-config.yaml @@ -0,0 +1,6 @@ +skip_strings: + # will only be skipped in corresponding files + config.toml: + - '# sentry_dsn = "https://:@sentry.io/"' +skip_paths: + - trufflehog-config.yaml