diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9e659f4f55ad8da49f6b2c8b644559709965c68_LmdpdGxhYi1jaS55bWw=..d867dd519c41cafe29b7ca0375a6623648ff7572_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,7 +63,7 @@ # will use images from that registry and not depend on GitLab.com BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" - BUILDER_IMAGE_REVISION: "3.2.0" + BUILDER_IMAGE_REVISION: "3.3.1" # The registry to pull the assets image from ASSET_REGISTRY: "${CI_REGISTRY}" ASSET_SYNC_EXISTING_REMOTE_FILES: "keep" diff --git a/config/software/gitlab-pages.rb b/config/software/gitlab-pages.rb index d9e659f4f55ad8da49f6b2c8b644559709965c68_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1wYWdlcy5yYg==..d867dd519c41cafe29b7ca0375a6623648ff7572_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1wYWdlcy5yYg== 100644 --- a/config/software/gitlab-pages.rb +++ b/config/software/gitlab-pages.rb @@ -33,6 +33,10 @@ # since it requires the package to be in $GOPATH/src/package env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/gitlab-pages" } + # Pages compiles with CGO_ENABLED=0 by default, so we need to activate + # FIPS mode explicitly. + env['FIPS_MODE'] = '1' if Build::Check.use_system_ssl? + make 'gitlab-pages', env: env move 'gitlab-pages', "#{install_dir}/embedded/bin/gitlab-pages" diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml index d9e659f4f55ad8da49f6b2c8b644559709965c68_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..d867dd519c41cafe29b7ca0375a6623648ff7572_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644 --- a/gitlab-ci-config/dev-gitlab-org.yml +++ b/gitlab-ci-config/dev-gitlab-org.yml @@ -592,6 +592,6 @@ <<: *branch_build <<: *dev-ee-branch-only CentOS-8-fips-branch: - image: "${BUILDER_IMAGE_REGISTRY}/centos_8:${BUILDER_IMAGE_REVISION}" + image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}" extends: .fips_branch_template Ubuntu-18.04-fips-branch: @@ -596,5 +596,5 @@ extends: .fips_branch_template Ubuntu-18.04-fips-branch: - image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}" + image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04_fips:${BUILDER_IMAGE_REVISION}" extends: .fips_branch_template Ubuntu-20.04-fips-branch: @@ -599,6 +599,6 @@ extends: .fips_branch_template Ubuntu-20.04-fips-branch: - image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04:${BUILDER_IMAGE_REVISION}" + image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_20.04_fips:${BUILDER_IMAGE_REVISION}" extends: .fips_branch_template Docker-branch: