Commit 9709e5f5 authored by Darren Shepherd's avatar Darren Shepherd
Browse files

Merge pull request #1409 from ibuildthecloud/conntrack

Add conntrack and remove nodejs
parents bf596c2b e76605ee
No related merge requests found
Showing with 2 additions and 2 deletions
+2 -2
......@@ -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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment