Skip to content

Commit

Permalink
bump guardian runc
Browse files Browse the repository at this point in the history
[finishes #151330674]

Submodule src/code.cloudfoundry.org/guardian caeb24d..e8454cc:
  > Remove newuidmap and newgidmap flags
  > Simplify config in gqt/restart_test.go
  > Make gqt restart tests more robust when run in parallel
Submodule src/github.com/opencontainers/runc 87e8b00...865735b:
  > Merge remote-tracking branches 'origin/1269-initial-console-sizing' and 'origin/rootless-cgroups' into await-prs-20170927
  > Merge pull request #1600 from crosbymichael/console
  > Merge pull request #1599 from tklauser/unconvert
  > Merge pull request #1598 from euank/ragent
  > Merge pull request #1597 from s7v7nislands/unused_var
  > Merge pull request #1593 from s7v7nislands/drop_go1.5
  > Merge pull request #1586 from crosbymichael/set-cgroups
  > merge branch 'pr-1579'
  > merge branch 'pr-1577'
  > Merge pull request #1455 from dqminh/epoll-io
  > Merge pull request #1529 from giuseppe/rootless-improvements
  > Merge pull request #1588 from s7v7nislands/delete_unused
  > Merge pull request #1587 from Mashimiao/fix-namespace-empty
  > Merge pull request #1589 from xiaochenshen/rdt-cat-bug-fix
  > Merge pull request #1569 from cyphar/delay-seccomp
  > Merge pull request #1541 from adrianreber/lazy
  > Merge pull request #1279 from xiaochenshen/rdt-cat-resource-manager-v1
  > Merge pull request #1575 from cyphar/tty-resize-ignore-errors
  > Merge pull request #1578 from cyphar/remove-shfmt-from-ci
  > Merge pull request #1572 from tych0/fix-readonly-userns
  > Merge branch 'pr-1573'
  > Merge pull request #1570 from cyphar/close-statedirfd-hole
  > Merge pull request #1561 from nseps/master
  > merge branch 'pr-1560'
  > Merge pull request #1559 from Mashimiao/panic-fix-nil-linux
  > Merge pull request #1554 from cyphar/use-umoci-release-script
  > Merge pull request #1558 from hqhq/update_state
  > Merge pull request #1542 from cyphar/buildmode-pic
  > Merge pull request #1555 from cyphar/remove-install-flag-makefile
  > Merge pull request #1556 from hqhq/fix_flakytest_TestNotifyOnOOM
  > Merge pull request #1551 from crosbymichael/linux-nil
  > Merge pull request #1553 from mlaventure/handle-non-devices
  > merge branch 'pr-1532'
  > Merge pull request #1506 from LittleLightLittleFire/1443-runc-reap-child-process
  < Revert "Revert "Updated logrus to v1""
  > merge branch 'pr-1535'
  > merge branch 'pr-1548'
  > Merge pull request #1544 from mlaventure/fix-device-from-path
  > Merge pull request #1545 from mlaventure/user-pkg-move-unix-call
  > Merge pull request #1543 from avagin/maintainer
  > Merge pull request #1537 from tklauser/staticcheck
  > Merge pull request #1477 from yummypeng/save-own-ns-path
  < Revert "Updated logrus to v1"
  < Merge branch 'rootless-cgroups' into await-prs-20170725
  < Merge branches 'rootless-id-mapping' and '1269-initial-console-sizing' into await-prs-20170725

Signed-off-by: Roberto Jimenez Sanchez <[email protected]>
Signed-off-by: Craig Furman <[email protected]>
  • Loading branch information
MissingRoberto authored and Craig Furman committed Sep 27, 2017
1 parent f550c41 commit c7c3773
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
[submodule "src/github.com/opencontainers/runc"]
path = src/github.com/opencontainers/runc
url = https://github.com/cloudfoundry-incubator/runc
branch = await-prs-20170725
branch = await-prs-20170927
[submodule "src/github.com/vishvananda/netns"]
path = src/github.com/vishvananda/netns
url = https://github.com/vishvananda/netns
Expand Down
6 changes: 4 additions & 2 deletions jobs/garden/templates/garden_ctl.erb
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@ case $1 in
--dadoo-bin=/var/vcap/packages/guardian/bin/dadoo \
--nstar-bin=/var/vcap/packages/guardian/bin/nstar \
--tar-bin=/var/vcap/packages/tar/tar \
--newuidmap-bin=/var/vcap/packages/garden-idmapper/bin/newuidmap \
--newgidmap-bin=/var/vcap/packages/garden-idmapper/bin/newgidmap \
--log-level=<%= p("garden.log_level") %> \
--mtu=<%= p("garden.network_mtu") %> \
--network-pool=<%= p("garden.network_pool") %> \
Expand Down Expand Up @@ -314,6 +312,10 @@ case $1 in
<% if p("garden.cleanup_process_dirs_on_wait") %> \
--cleanup-process-dirs-on-wait \
<% end %> \
--uid-map-start=1 \
--uid-map-length=$(($(maximus)-1)) \
--gid-map-start=1 \
--gid-map-length=$(($(maximus)-1)) \
;;

stop)
Expand Down
2 changes: 1 addition & 1 deletion src/github.com/opencontainers/runc
Submodule runc updated from 87e8b0 to 865735

0 comments on commit c7c3773

Please sign in to comment.