diff --git a/Dockerfile b/Dockerfile index 1095d4f58de85631a620c573b566b40c0f4a730c..3de9532d9419a35bd03ef7fc1e7c3616500ebefa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -ARG GITLAB_VERSION=v17.8.2-ubi +ARG GITLAB_VERSION=v17.9.0-ubi ARG BASE_REGISTRY=registry1.dso.mil/ironbank ARG BASE_IMAGE=gitlab/gitlab/gitlab-base -ARG BASE_TAG=17.8.2 +ARG BASE_TAG=17.9.0 ARG UBI_TAG=9.5 ## FINAL IMAGE ## @@ -10,10 +10,10 @@ 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_MICRO_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi9-micro:${UBI_TAG} -FROM ${UBI_MICRO_IMAGE} as target +FROM ${UBI_MICRO_IMAGE} AS target -FROM ${UBI_IMAGE} as build +FROM ${UBI_IMAGE} AS build ARG DNF_OPTS=--disableplugin=subscription-manager ARG DNF_OPTS_ROOT="--installroot=/install-root --setopt=reposdir=/etc/yum.repos.d/ --setopt=cachedir=/install-cache/ --setopt=varsdir= --config= --noplugins" diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 59f9d54b4b28fa4a60a1dc886d83d85f377706bd..30c7b33ea894b6297b57fae466c929606816cd3c 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.8.2} +TAG=${3:-17.9.0} DOCKER_BUILD="${DOCKER_BUILD:-docker build}" DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index aac6e6edc143a31420d171c21835422dd2166bfa..3ac66cf3318aa5f0cedddeea42a490eb7d32ae59 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-pages" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "17.8.2" + - "17.9.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-base" - BASE_TAG: "17.8.2" + BASE_TAG: "17.9.0" UBI_TAG: "9.5" # Docker image labels labels: @@ -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.8.2" + org.opencontainers.image.version: "17.9.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.8.2-ubi/gitlab-pages.tar.gz" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi-build-dependencies-v17.9.0-ubi/gitlab-pages.tar.gz" filename: "gitlab-pages.tar.gz" validation: type: "sha256" - value: "cfd4536becb65c1df040b171dc375f170f03d5f996dc5ffa452e2c0794c7a8ed" + value: "546ac2d8bc52f0f774bd9419b4cef7a790675c8de9a83af76516fc1abc515611"