diff --git a/Dockerfile b/Dockerfile index 17db7e57ca18adad18bbcc74db12af29134c753f..773e90592df9ca1d9cdc729ee12d59572b22d99b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ -ARG GITLAB_VERSION=v17.6.2-ubi +ARG GITLAB_VERSION=v17.7.0-ubi ARG BASE_REGISTRY=registry1.dso.mil/ironbank ARG BASE_IMAGE=gitlab/gitlab/gitlab-base -ARG BASE_TAG=17.6.2 -ARG UBI_TAG=9.4 +ARG BASE_TAG=17.7.0 +ARG UBI_TAG=9.5 ## FINAL IMAGE ## ARG GITLAB_BASE_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-base:${BASE_TAG} ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi9-minimal:${UBI_TAG} -ARG UBI_IMAGE_MICRO=${BASE_REGISTRY}/redhat/ubi/ubi9-micro:${UBI_TAG} +ARG UBI_MICRO_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi9-micro:${UBI_TAG} -FROM ${UBI_IMAGE_MICRO} as target +FROM ${UBI_MICRO_IMAGE} as target FROM ${UBI_IMAGE} as build diff --git a/build-scripts/build.sh b/build-scripts/build.sh index f87d22928ca787335e03282d394cec1af457e1bb..ac9472872cbffc0f2ddc7a8e957dd2a0094f6ff0 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -6,7 +6,7 @@ set -euxo pipefail REGISTRY=${1:-} REPOSITORY=${2:-"$(basename "$(builtin cd "$(dirname "$0")/.."; pwd)")"} -TAG=${3:-17.6.2} +TAG=${3:-17.7.0} DOCKER_BUILD="${DOCKER_BUILD:-docker build}" DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 50dca7eadaa00001797f662f4ee1488273c2bcf0..0e96e506d6a33bccbcbc71298a4ea00afba606b2 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,13 +5,13 @@ name: "gitlab/gitlab/gitlab-pages" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "17.6.2" + - "17.7.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-base" - BASE_TAG: "17.6.2" - UBI_TAG: "9.4" + BASE_TAG: "17.7.0" + UBI_TAG: "9.5" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Pages" @@ -23,7 +23,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: "17.6.2" + org.opencontainers.image.version: "17.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" @@ -50,8 +50,8 @@ maintainers: email: "help@dsop.io" cht_member: true resources: - - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.6.2-ubi/gitlab-pages.tar.gz" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.7.0-ubi/gitlab-pages.tar.gz" filename: "gitlab-pages.tar.gz" validation: type: "sha256" - value: "74394b5dcf0d6e1a3611bb3cdf01ff24dbd5a0ae15450b301d4c73b7b5121a33" + value: "2a3770e5d576a98a7b14626e962be111e484690735f944ca959a5281f623d64d"