Merge pull request rancher#7176 from cloudnautique/add_ssl_script_age…

…nt_base Pull in the update-rancher-ssl script
Cerfoglg · Dec 22, 2016 · fd6bf0f · fd6bf0f
2 parents 867ac38 + 9636035
commit fd6bf0f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/agent-base/Dockerfile b/agent-base/Dockerfile
@@ -1,4 +1,7 @@
 FROM ubuntu:16.04
+
+COPY ./rancher-entrypoint.sh /
+ENV SSL_SCRIPT_COMMIT 98660ada3d800f653fc1f105771b5173f9d1a019
 RUN apt-get update && \
         apt-get install --no-install-recommends -y \
         arptables \
@@ -29,4 +32,8 @@ RUN apt-get update && \
     curl -sLf https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 > /usr/bin/docker && \
     chmod +x /usr/bin/docker && \
     rm /var/run && \
-    mkdir /var/run
+    mkdir /var/run && \
+    curl -sLf https://raw.githubusercontent.com/rancher/rancher/${SSL_SCRIPT_COMMIT}/server/bin/update-rancher-ssl > /usr/bin/update-rancher-ssl && \
+    chmod +x /usr/bin/update-rancher-ssl
+
+ENTRYPOINT ["/rancher-entrypoint.sh"]
diff --git a/agent-base/rancher-entrypoint.sh b/agent-base/rancher-entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+/usr/bin/update-rancher-ssl
+
+exec "$@"