Move the ulimit -n call from 01-startup/script.sh to the 02-dbus/run

diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh b/docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh
index 253c0afabfdc0622d41b2f5b9152dcb7f7582376..3037e98ad2910beacec23c4adf26bead52b96030 100644 (file)
--- a/docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh
+++ b/docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh
@@ -1,5 +1,2 @@
 #!/bin/sh
 echo "STARTING - $(date)"
-
-# Set the limit to the same value Docker has been using in earlier version.
-ulimit -n 1048576

diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run b/docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run
index 15018b7e51e68a5ea8b5e3636b19ef4f26d68e22..f0e4aa5034a3e7dba721239ddf26a1768cd95e43 100644 (file)
--- a/docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run
+++ b/docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run
@@ -1,3 +1,7 @@
 #!/command/with-contenv sh
+
+# Set the limit to the same value Docker has been using in earlier version.
+ulimit -n 1048576
+
 echo "Starting dbus"
 exec s6-notifyoncheck  dbus-daemon --system --nofork --nopidfile

diff --git a/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh b/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh
index 253c0afabfdc0622d41b2f5b9152dcb7f7582376..3037e98ad2910beacec23c4adf26bead52b96030 100644 (file)
--- a/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh
+++ b/docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh
@@ -1,5 +1,2 @@
 #!/bin/sh
 echo "STARTING - $(date)"
-
-# Set the limit to the same value Docker has been using in earlier version.
-ulimit -n 1048576

diff --git a/docker/etc/s6-overlay/s6-rc.d/02-dbus/run b/docker/etc/s6-overlay/s6-rc.d/02-dbus/run
index 15018b7e51e68a5ea8b5e3636b19ef4f26d68e22..f0e4aa5034a3e7dba721239ddf26a1768cd95e43 100644 (file)
--- a/docker/etc/s6-overlay/s6-rc.d/02-dbus/run
+++ b/docker/etc/s6-overlay/s6-rc.d/02-dbus/run
@@ -1,3 +1,7 @@
 #!/command/with-contenv sh
+
+# Set the limit to the same value Docker has been using in earlier version.
+ulimit -n 1048576
+
 echo "Starting dbus"
 exec s6-notifyoncheck  dbus-daemon --system --nofork --nopidfile