diff --git a/config/software/alertmanager.rb b/config/software/alertmanager.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL2FsZXJ0bWFuYWdlci5yYg==..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL2FsZXJ0bWFuYWdlci5yYg== 100644 --- a/config/software/alertmanager.rb +++ b/config/software/alertmanager.rb @@ -38,6 +38,7 @@ env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/alertmanager", 'GO111MODULE' => 'on', + 'GOTOOLCHAIN' => 'local', } exporter_source_dir = "#{Omnibus::Config.source_dir}/alertmanager" cwd = "#{exporter_source_dir}/src/#{go_source}" diff --git a/config/software/consul.rb b/config/software/consul.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL2NvbnN1bC5yYg==..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL2NvbnN1bC5yYg== 100644 --- a/config/software/consul.rb +++ b/config/software/consul.rb @@ -33,4 +33,5 @@ build do env = {} env['GOPATH'] = "#{Omnibus::Config.source_dir}/consul" + env['GOTOOLCHAIN'] = 'local' env['PATH'] = "#{Gitlab::Util.get_env('PATH')}:#{env['GOPATH']}/bin" @@ -36,4 +37,5 @@ env['PATH'] = "#{Gitlab::Util.get_env('PATH')}:#{env['GOPATH']}/bin" + command 'make dev', env: env mkdir "#{install_dir}/embedded/bin" copy 'bin/consul', "#{install_dir}/embedded/bin/" diff --git a/config/software/docker-distribution-pruner.rb b/config/software/docker-distribution-pruner.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL2RvY2tlci1kaXN0cmlidXRpb24tcHJ1bmVyLnJi..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL2RvY2tlci1kaXN0cmlidXRpb24tcHJ1bmVyLnJi 100644 --- a/config/software/docker-distribution-pruner.rb +++ b/config/software/docker-distribution-pruner.rb @@ -29,7 +29,10 @@ relative_path 'src/gitlab.com/gitlab-org/docker-distribution-pruner' build do - env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/docker-distribution-pruner" } + env = { + 'GOPATH' => "#{Omnibus::Config.source_dir}/docker-distribution-pruner", + 'GOTOOLCHAIN' => 'local', + } command "go build -ldflags '-s -w' ./cmds/docker-distribution-pruner", env: env diff --git a/config/software/gitlab-pages.rb b/config/software/gitlab-pages.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1wYWdlcy5yYg==..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1wYWdlcy5yYg== 100644 --- a/config/software/gitlab-pages.rb +++ b/config/software/gitlab-pages.rb @@ -29,9 +29,12 @@ relative_path 'src/gitlab.com/gitlab-org/gitlab-pages' build do - # This is required for GO15VENDOREXPERIMENT=1 to work properly, - # since it requires the package to be in $GOPATH/src/package - env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/gitlab-pages" } + env = { + # This is required for GO15VENDOREXPERIMENT=1 to work properly, + # since it requires the package to be in $GOPATH/src/package + 'GOPATH' => "#{Omnibus::Config.source_dir}/gitlab-pages", + 'GOTOOLCHAIN' => 'local', + } # Pages compiles with CGO_ENABLED=0 by default, so we need to activate # FIPS mode explicitly. diff --git a/config/software/go-crond.rb b/config/software/go-crond.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL2dvLWNyb25kLnJi..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL2dvLWNyb25kLnJi 100644 --- a/config/software/go-crond.rb +++ b/config/software/go-crond.rb @@ -28,6 +28,7 @@ build do env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/go-crond", + 'GOTOOLCHAIN' => 'local', } make 'build', env: env diff --git a/config/software/node-exporter.rb b/config/software/node-exporter.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL25vZGUtZXhwb3J0ZXIucmI=..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL25vZGUtZXhwb3J0ZXIucmI= 100644 --- a/config/software/node-exporter.rb +++ b/config/software/node-exporter.rb @@ -37,6 +37,7 @@ 'GOPATH' => "#{Omnibus::Config.source_dir}/node-exporter", 'CGO_ENABLED' => '0', # Details: https://github.com/prometheus/node_exporter/issues/870 'GO111MODULE' => 'on', + 'GOTOOLCHAIN' => 'local', } prom_version = Prometheus::VersionFlags.new(version) diff --git a/config/software/pgbouncer-exporter.rb b/config/software/pgbouncer-exporter.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL3BnYm91bmNlci1leHBvcnRlci5yYg==..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL3BnYm91bmNlci1leHBvcnRlci5yYg== 100644 --- a/config/software/pgbouncer-exporter.rb +++ b/config/software/pgbouncer-exporter.rb @@ -37,6 +37,7 @@ env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/pgbouncer-exporter", 'GO111MODULE' => 'on', + 'GOTOOLCHAIN' => 'local', } prom_version = Prometheus::VersionFlags.new(version) diff --git a/config/software/postgres-exporter.rb b/config/software/postgres-exporter.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL3Bvc3RncmVzLWV4cG9ydGVyLnJi..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL3Bvc3RncmVzLWV4cG9ydGVyLnJi 100644 --- a/config/software/postgres-exporter.rb +++ b/config/software/postgres-exporter.rb @@ -34,6 +34,7 @@ build do env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/postgres-exporter", + 'GOTOOLCHAIN' => 'local', } prom_version = Prometheus::VersionFlags.new(version) diff --git a/config/software/prometheus.rb b/config/software/prometheus.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL3Byb21ldGhldXMucmI=..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL3Byb21ldGhldXMucmI= 100644 --- a/config/software/prometheus.rb +++ b/config/software/prometheus.rb @@ -39,6 +39,7 @@ env = { 'GOPATH' => prometheus_source_dir, 'GO111MODULE' => 'on', + 'GOTOOLCHAIN' => 'local', } prom_version = Prometheus::VersionFlags.new(version) diff --git a/config/software/redis-exporter.rb b/config/software/redis-exporter.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL3JlZGlzLWV4cG9ydGVyLnJi..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL3JlZGlzLWV4cG9ydGVyLnJi 100644 --- a/config/software/redis-exporter.rb +++ b/config/software/redis-exporter.rb @@ -34,6 +34,7 @@ env = { 'GOPATH' => "#{Omnibus::Config.source_dir}/redis-exporter", 'GO111MODULE' => 'on', + 'GOTOOLCHAIN' => 'local', } ldflags = [ diff --git a/config/software/registry.rb b/config/software/registry.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL3JlZ2lzdHJ5LnJi..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL3JlZ2lzdHJ5LnJi 100644 --- a/config/software/registry.rb +++ b/config/software/registry.rb @@ -36,7 +36,8 @@ cwd = "#{registry_source_dir}/#{relative_path}" env = { 'GOPATH' => registry_source_dir, - 'BUILDTAGS' => 'include_gcs include_oss' + 'BUILDTAGS' => 'include_gcs include_oss', + 'GOTOOLCHAIN' => 'local', } make "build", env: env, cwd: cwd diff --git a/config/software/spamcheck.rb b/config/software/spamcheck.rb index 099c6d270b7d79881dd6a17b0ea2557fd70fb7d4_Y29uZmlnL3NvZnR3YXJlL3NwYW1jaGVjay5yYg==..5d1d43af20dba58555ba4574851bbe741ea563e5_Y29uZmlnL3NvZnR3YXJlL3NwYW1jaGVjay5yYg== 100644 --- a/config/software/spamcheck.rb +++ b/config/software/spamcheck.rb @@ -34,6 +34,7 @@ env = with_standard_compiler_flags(with_embedded_path) env['GOPATH'] = "#{Omnibus::Config.source_dir}/spamcheck" env['PATH'] = "#{env['PATH']}:#{env['GOPATH']}/bin" + env['GOTOOLCHAIN'] = 'local' mkdir "#{install_dir}/embedded/service" mkdir "#{install_dir}/embedded/bin"