Merge branch 'patch-1' into 'master'

Build registry with include_gcs tag

See merge request !1424
This commit is contained in:
Marin Jankovski 2017-04-11 14:14:16 +00:00
commit deb707fda2
1 changed files with 5 additions and 3 deletions

View File

@ -33,11 +33,13 @@ relative_path 'src/github.com/docker/distribution'
build do
env = {
'GOPATH' => "#{Omnibus::Config.source_dir}/registry",
'GO15VENDOREXPERIMENT' => '1' # Build machines have go 1.5.x, use vendor directory
'GO15VENDOREXPERIMENT' => '1', # Build machines have go 1.5.x, use vendor directory
'PREFIX' => "#{install_dir}/embedded",
'DOCKER_BUILDTAGS' => 'include_gcs'
}
registry_source_dir = "#{Omnibus::Config.source_dir}/registry"
cwd = "#{registry_source_dir}/src/github.com/docker/distribution"
make "build PREFIX=#{install_dir}/embedded", env: env, cwd: cwd
make "binaries PREFIX=#{install_dir}/embedded", env: env, cwd: cwd
make "build", env: env, cwd: cwd
make "binaries", env: env, cwd: cwd
end