diff --git a/config/software/alertmanager.rb b/config/software/alertmanager.rb index 65388080de47191580e34aa47f5f29018e75fd7c_Y29uZmlnL3NvZnR3YXJlL2FsZXJ0bWFuYWdlci5yYg==..60ce33df6596bbce728f3040f71967011ba735a8_Y29uZmlnL3NvZnR3YXJlL2FsZXJ0bWFuYWdlci5yYg== 100644 --- a/config/software/alertmanager.rb +++ b/config/software/alertmanager.rb @@ -47,6 +47,6 @@ command "go build -ldflags '#{prom_version.print_ldflags}' ./cmd/alertmanager", env: env, cwd: cwd copy 'alertmanager', "#{install_dir}/embedded/bin/" - command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" + command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" copy "license.json", "#{install_dir}/licenses/alertmanager.json" end diff --git a/config/software/consul.rb b/config/software/consul.rb index 65388080de47191580e34aa47f5f29018e75fd7c_Y29uZmlnL3NvZnR3YXJlL2NvbnN1bC5yYg==..60ce33df6596bbce728f3040f71967011ba735a8_Y29uZmlnL3NvZnR3YXJlL2NvbnN1bC5yYg== 100644 --- a/config/software/consul.rb +++ b/config/software/consul.rb @@ -35,6 +35,6 @@ mkdir "#{install_dir}/embedded/bin" copy 'bin/consul', "#{install_dir}/embedded/bin/" - command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" + command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" copy "license.json", "#{install_dir}/licenses/consul.json" end diff --git a/config/software/docker-distribution-pruner.rb b/config/software/docker-distribution-pruner.rb index 65388080de47191580e34aa47f5f29018e75fd7c_Y29uZmlnL3NvZnR3YXJlL2RvY2tlci1kaXN0cmlidXRpb24tcHJ1bmVyLnJi..60ce33df6596bbce728f3040f71967011ba735a8_Y29uZmlnL3NvZnR3YXJlL2RvY2tlci1kaXN0cmlidXRpb24tcHJ1bmVyLnJi 100644 --- a/config/software/docker-distribution-pruner.rb +++ b/config/software/docker-distribution-pruner.rb @@ -34,6 +34,6 @@ command "go build -ldflags '-s -w' ./cmds/docker-distribution-pruner", env: env copy 'docker-distribution-pruner', "#{install_dir}/embedded/bin/" - command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" + command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" copy "license.json", "#{install_dir}/licenses/docker-distribution-pruner.json" end diff --git a/config/software/gitlab-pages.rb b/config/software/gitlab-pages.rb index 65388080de47191580e34aa47f5f29018e75fd7c_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1wYWdlcy5yYg==..60ce33df6596bbce728f3040f71967011ba735a8_Y29uZmlnL3NvZnR3YXJlL2dpdGxhYi1wYWdlcy5yYg== 100644 --- a/config/software/gitlab-pages.rb +++ b/config/software/gitlab-pages.rb @@ -40,6 +40,6 @@ make 'gitlab-pages', env: env move 'gitlab-pages', "#{install_dir}/embedded/bin/gitlab-pages" - command "license_finder report --enabled-package-managers godep gomodules dep --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" + command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" copy "license.json", "#{install_dir}/licenses/gitlab-pages.json" end diff --git a/config/software/node-exporter.rb b/config/software/node-exporter.rb index 65388080de47191580e34aa47f5f29018e75fd7c_Y29uZmlnL3NvZnR3YXJlL25vZGUtZXhwb3J0ZXIucmI=..60ce33df6596bbce728f3040f71967011ba735a8_Y29uZmlnL3NvZnR3YXJlL25vZGUtZXhwb3J0ZXIucmI= 100644 --- a/config/software/node-exporter.rb +++ b/config/software/node-exporter.rb @@ -44,6 +44,6 @@ command "go build -ldflags '#{prom_version.print_ldflags}'", env: env copy 'node_exporter', "#{install_dir}/embedded/bin/" - command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" + command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" copy "license.json", "#{install_dir}/licenses/node-exporter.json" end diff --git a/config/software/pgbouncer-exporter.rb b/config/software/pgbouncer-exporter.rb index 65388080de47191580e34aa47f5f29018e75fd7c_Y29uZmlnL3NvZnR3YXJlL3BnYm91bmNlci1leHBvcnRlci5yYg==..60ce33df6596bbce728f3040f71967011ba735a8_Y29uZmlnL3NvZnR3YXJlL3BnYm91bmNlci1leHBvcnRlci5yYg== 100644 --- a/config/software/pgbouncer-exporter.rb +++ b/config/software/pgbouncer-exporter.rb @@ -43,6 +43,6 @@ command "go build -mod=vendor -ldflags '#{prom_version.print_ldflags}'", env: env copy 'pgbouncer_exporter', "#{install_dir}/embedded/bin/" - command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" + command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" copy "license.json", "#{install_dir}/licenses/pgbouncer-exporter.json" end diff --git a/config/software/postgres-exporter.rb b/config/software/postgres-exporter.rb index 65388080de47191580e34aa47f5f29018e75fd7c_Y29uZmlnL3NvZnR3YXJlL3Bvc3RncmVzLWV4cG9ydGVyLnJi..60ce33df6596bbce728f3040f71967011ba735a8_Y29uZmlnL3NvZnR3YXJlL3Bvc3RncmVzLWV4cG9ydGVyLnJi 100644 --- a/config/software/postgres-exporter.rb +++ b/config/software/postgres-exporter.rb @@ -41,6 +41,6 @@ command "go build -ldflags '#{prom_version.print_ldflags}' ./cmd/postgres_exporter", env: env copy 'postgres_exporter', "#{install_dir}/embedded/bin/" - command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" + command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" copy "license.json", "#{install_dir}/licenses/postgres-exporter.json" end diff --git a/config/software/redis-exporter.rb b/config/software/redis-exporter.rb index 65388080de47191580e34aa47f5f29018e75fd7c_Y29uZmlnL3NvZnR3YXJlL3JlZGlzLWV4cG9ydGVyLnJi..60ce33df6596bbce728f3040f71967011ba735a8_Y29uZmlnL3NvZnR3YXJlL3JlZGlzLWV4cG9ydGVyLnJi 100644 --- a/config/software/redis-exporter.rb +++ b/config/software/redis-exporter.rb @@ -47,6 +47,6 @@ command "go build -ldflags '#{ldflags}'", env: env copy 'redis_exporter', "#{install_dir}/embedded/bin/" - command "license_finder report --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" + command "license_finder report --enabled-package-managers godep gomodules --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json" copy "license.json", "#{install_dir}/licenses/redis-exporter.json" end