Unverified Commit 777416b7 authored by boklm's avatar boklm
Browse files

Bug 40547: Use container/remote_* from rbm

With rbm#40029, container/remote_* is now added directly to rbm, so we
can remove it from rbm.conf.

We also need to rename a few options:
- var/container/use_container -> container/use_container
- var/container/global_disable -> container/global_disable
- var/container/disable_network -> container/disable_network
- var/container/dir -> container/dir
parent 51acc456
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ Otherwise, when calling gradle in the project's build script replace the
`--offline` flag with `--debug` and remove any `-Dmaven.repo.local` arguments.

Finally, allow network access during the build by setting
`var/container/disable_network/build` to `0` in rbm.conf, and rerun the build.
`container/disable_network/build` to `0` in rbm.conf, and rerun the build.

Dependent artifacts will show up as downloads in the logs. You can pull out
these dependencies into a list by passing the log file to the gradle dependency
+3 −2
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil

build: '[% c("projects/go/var/build_go_lib") %]'

var:
container:
  use_container: 1

var:
  go_lib: github.com/sclevine/agouti

input_files:
+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ git_url: https://github.com/aio-libs/aiohttp.git
git_hash: f6f647eb828fa738610d61481f11fa51e42599e9
# TODO: This Git repo doesn't use GPG sigs.  We should pester them about that.
filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
var:
container:
  use_container: 1
input_files:
+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ git_url: https://github.com/romis2012/aiohttp-socks.git
git_hash: 3252f4bdd37fb9a7360481977f800189cb3e3aca
# TODO: This Git repo doesn't use GPG sigs.  We should pester them about that.
filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
var:
container:
  use_container: 1
input_files:
+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ git_url: https://github.com/kyuupichan/aiorpcX.git
git_hash: 4f39366e5dee3fd0a857e53f383c628807cd2715
# TODO: This Git repo doesn't use GPG sigs.  We should pester them about that.
filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].tar.gz"
var:
container:
  use_container: 1
input_files:
Loading