Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
barry cho
Rancher
Commits
9709e5f5
Commit
9709e5f5
authored
9 years ago
by
Darren Shepherd
Browse files
Options
Download
Plain Diff
Merge pull request #1409 from ibuildthecloud/conntrack
Add conntrack and remove nodejs
parents
bf596c2b
e76605ee
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
agent/Dockerfile
+2
-2
agent/Dockerfile
with
2 additions
and
2 deletions
+2
-2
agent/Dockerfile
+
2
-
2
View file @
9709e5f5
...
...
@@ -17,9 +17,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends libssl-dev pyth
RUN
curl
-s
http://stedolan.github.io/jq/download/linux64/jq
>
/usr/bin/jq
;
chmod
+x /usr/bin/jq
RUN
curl
-s
https://get.docker.io/builds/Linux/x86_64/docker-1.6.0
>
/usr/bin/docker
;
chmod
+x /usr/bin/docker
RUN
curl
-s
-L
https://github.com/rancherio/thin-provisioning-tools/releases/download/rancher-v0.1/pdata_tools
>
/usr/bin/pdata_tools
;
chmod
+x /usr/bin/pdata_tools
RUN
apt-get update
&&
apt-get
install
-y
--no-install-recommends
nodejs
RUN
apt-get update
&&
apt-get
install
-y
--no-install-recommends
conntrack
RUN
mkdir
-p
/var/lib/cattle /var/lib/rancher
COPY
register.py resolve_url.py agent.sh run.sh /
ENTRYPOINT
["/run.sh"]
LABEL
"io.rancher.container.system"="rancher-agent"
ENV
RANCHER_AGENT_IMAGE rancher/agent:v0.7.
9
ENV
RANCHER_AGENT_IMAGE rancher/agent:v0.7.
10
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
Menu
Projects
Groups
Snippets
Help