Update Docker version to 18.06.3-ce

apache · Apr 12, 2019 · 19f03eb · 19f03eb
1 parent 30a1bd7
commit 19f03eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/ansible/roles/invoker/tasks/deploy.yml b/ansible/roles/invoker/tasks/deploy.yml
@@ -290,7 +290,7 @@
 
 - name: set invoker runc volume
   set_fact:
-    volumes: "{{ volumes }},/run/runc:/run/runc"
+    volumes: "{{ volumes }},/run/docker/runtime-runc/moby:/run/runc"
   when: invoker.useRunc == true
 
 - name: define options when deploying invoker on Ubuntu

diff --git a/core/invoker/Dockerfile b/core/invoker/Dockerfile
@@ -5,20 +5,18 @@ FROM scala
 
 ENV UID=1001 \
     NOT_ROOT_USER=owuser
-ENV DOCKER_VERSION=1.12.0 \
-    DOCKER_DOWNLOAD_SHA256=3dd07f65ea4a7b4c8829f311ab0213bca9ac551b5b24706f3e79a97e22097f8b
+    ENV DOCKER_VERSION=18.06.3-ce
 
 RUN apk add --update openssl
 
 # Uncomment to fetch latest version of docker instead: RUN wget -qO- https://get.docker.com | sh
 # Install docker client
-RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz && \
-echo "${DOCKER_DOWNLOAD_SHA256}  docker-${DOCKER_VERSION}.tgz" | sha256sum -c - && \
-tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
-tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \
-rm -f docker-${DOCKER_VERSION}.tgz && \
-chmod +x /usr/bin/docker && \
-chmod +x /usr/bin/docker-runc
+RUN curl -sSL -o docker-${DOCKER_VERSION}.tgz https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \
+    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker && \
+    tar --strip-components 1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker-runc && \
+    rm -f docker-${DOCKER_VERSION}.tgz && \
+    chmod +x /usr/bin/docker && \
+    chmod +x /usr/bin/docker-runc
 
 ADD build/distributions/invoker.tar ./