Skip to content
Snippets Groups Projects
Commit d867dd51 authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'sh-bump-omnibus-version-3.3.0-fips' into 'master'

Bump BUILDER_IMAGE_REVISION to v3.3.1

See merge request gitlab-org/omnibus-gitlab!6056
parents d9e659f4 eeb1f099
No related branches found
No related tags found
1 merge request!72Intermediate build for testing purposes
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
# will use images from that registry and not depend on GitLab.com # will use images from that registry and not depend on GitLab.com
BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder" BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
PUBLIC_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 # The registry to pull the assets image from
ASSET_REGISTRY: "${CI_REGISTRY}" ASSET_REGISTRY: "${CI_REGISTRY}"
ASSET_SYNC_EXISTING_REMOTE_FILES: "keep" ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"
......
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
# since it requires the package to be in $GOPATH/src/package # since it requires the package to be in $GOPATH/src/package
env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/gitlab-pages" } 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 make 'gitlab-pages', env: env
move 'gitlab-pages', "#{install_dir}/embedded/bin/gitlab-pages" move 'gitlab-pages', "#{install_dir}/embedded/bin/gitlab-pages"
......
...@@ -592,6 +592,6 @@ ...@@ -592,6 +592,6 @@
<<: *branch_build <<: *branch_build
<<: *dev-ee-branch-only <<: *dev-ee-branch-only
CentOS-8-fips-branch: 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 extends: .fips_branch_template
Ubuntu-18.04-fips-branch: Ubuntu-18.04-fips-branch:
...@@ -596,5 +596,5 @@ ...@@ -596,5 +596,5 @@
extends: .fips_branch_template extends: .fips_branch_template
Ubuntu-18.04-fips-branch: 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 extends: .fips_branch_template
Ubuntu-20.04-fips-branch: Ubuntu-20.04-fips-branch:
...@@ -599,6 +599,6 @@ ...@@ -599,6 +599,6 @@
extends: .fips_branch_template extends: .fips_branch_template
Ubuntu-20.04-fips-branch: 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 extends: .fips_branch_template
Docker-branch: Docker-branch:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment