Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rancher
Commits
accd28a4
Commit
accd28a4
authored
8 years ago
by
Darren Shepherd
Browse files
Options
Download
Email Patches
Plain Diff
Don't exit agent on failure
parent
3a6aca68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
agent/Dockerfile
+1
-1
agent/Dockerfile
agent/run.sh
+2
-2
agent/run.sh
with
3 additions
and
3 deletions
+3
-3
agent/Dockerfile
+
1
-
1
View file @
accd28a4
...
...
@@ -24,4 +24,4 @@ COPY register.py resolve_url.py run.sh /
ENTRYPOINT
["/run.sh"]
LABEL
"io.rancher.container.system"="rancher-agent"
ENV
HOST_DOCKER_SOCK /var/run/docker.sock
ENV
RANCHER_AGENT_IMAGE rancher/agent:v1.1.0-rc1
4
ENV
RANCHER_AGENT_IMAGE rancher/agent:v1.1.0-rc1
5
This diff is collapsed.
Click to expand it.
agent/run.sh
+
2
-
2
View file @
accd28a4
...
...
@@ -305,9 +305,9 @@ run_bootstrap()
# Sanity check that these credentials are valid
if
curl
-u
${
CATTLE_ACCESS_KEY
}
:
${
CATTLE_SECRET_KEY
}
-s
${
CATTLE_URL
}
/schemas/configcontent
>
test.json 2>&1
;
then
if
[
"
$(
cat
test.json | jq
-r
.id
)
"
!=
"configContent"
]
;
then
if
cat
test.json | jq
-r
.id
>
/dev/null 2>&1
&&
[
"
$(
cat
test.json | jq
-r
.id
)
"
!=
"configContent"
]
;
then
error Credentials are no longer valid, please re-register this agent
exit
1
return
1
fi
fi
...
...
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