Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
barry cho
Rancher
Commits
746d145d
Commit
746d145d
authored
8 years ago
by
Darren Shepherd
Committed by
GitHub
8 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #8272 from ibuildthecloud/selinux-modules
Load some modules on startup
parents
88be2d3d
17d03fde
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
agent/Dockerfile
+1
-1
agent/Dockerfile
agent/run.sh
+13
-0
agent/run.sh
with
14 additions
and
1 deletion
+14
-1
agent/Dockerfile
+
1
-
1
View file @
746d145d
...
...
@@ -2,4 +2,4 @@ FROM rancher/agent-base:v0.3.0
COPY
register.py resolve_url.py run.sh /
ENTRYPOINT
["/run.sh"]
LABEL
"io.rancher.container.system"="rancher-agent"
ENV
RANCHER_AGENT_IMAGE rancher/agent:v1.2.1
ENV
RANCHER_AGENT_IMAGE rancher/agent:v1.2.
2-rc
1
This diff is collapsed.
Click to expand it.
agent/run.sh
+
13
-
0
View file @
746d145d
...
...
@@ -32,6 +32,15 @@ export CATTLE_HOME=${CATTLE_HOME:-/var/lib/cattle}
check_debug
MODULES
=
"ansi_cprng
drbg
esp4
veth
xfrm4_mode_tunnel
xfrm6_mode_tunnel
xt_mark
xt_nat"
CONTAINER
=
"
$(
hostname
)
"
if
[
"
$1
"
=
"run"
]
;
then
CONTAINER
=
"rancher-agent"
...
...
@@ -204,6 +213,10 @@ setup_state()
docker run
--privileged
--net
host
--pid
host
-v
/:/host
--rm
$RANCHER_AGENT_IMAGE
--
/usr/bin/share-mnt /var/lib/rancher/volumes /var/lib/kubelet
--
norun
cp
-f
/usr/bin/r /.r/r
||
true
for
m
in
$MODULES
;
do
modprobe
$m
>
/dev/null 2>&1
||
true
done
}
load
()
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment