diff --git a/config/software/registry.rb b/config/software/registry.rb index 3252357d0f3e972e38370db62a58b4eb39da8b7a_Y29uZmlnL3NvZnR3YXJlL3JlZ2lzdHJ5LnJi..22755591fdc8a2540db229b6f51bfcb33aa65b63_Y29uZmlnL3NvZnR3YXJlL3JlZ2lzdHJ5LnJi 100644 --- a/config/software/registry.rb +++ b/config/software/registry.rb @@ -31,4 +31,6 @@ relative_path 'src/github.com/docker/distribution' build do + registry_source_dir = "#{Omnibus::Config.source_dir}/registry" + cwd = "#{registry_source_dir}/src/github.com/docker/distribution" env = { @@ -34,5 +36,4 @@ env = { - 'GOPATH' => "#{Omnibus::Config.source_dir}/registry", - 'PREFIX' => "#{install_dir}/embedded", + 'GOPATH' => registry_source_dir, 'DOCKER_BUILDTAGS' => 'include_gcs include_oss' } @@ -37,7 +38,5 @@ 'DOCKER_BUILDTAGS' => 'include_gcs include_oss' } - registry_source_dir = "#{Omnibus::Config.source_dir}/registry" - cwd = "#{registry_source_dir}/src/github.com/docker/distribution" make "build", env: env, cwd: cwd make "binaries", env: env, cwd: cwd @@ -41,6 +40,7 @@ make "build", env: env, cwd: cwd make "binaries", env: env, cwd: cwd + move "#{cwd}/bin/*", "#{install_dir}/embedded/bin", force: true command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=csv --save=license.csv" copy "license.csv", "#{install_dir}/licenses/registry.csv"