From 6e605b68eeb18a87b36362c26c3aff07c4722229 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Sat, 9 May 2020 13:41:34 +0300
Subject: [PATCH] Change docker version used

---
 makefile => Makefile | 2 +-
 docker-compose.yml   | 9 ++++++---
 install.sh           | 2 +-
 jenkins/Dockerfile   | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)
 rename makefile => Makefile (92%)

diff --git a/makefile b/Makefile
similarity index 92%
rename from makefile
rename to Makefile
index ae466bd..640d627 100644
--- a/makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ run:
 	@docker-compose -p janus up -d
 stop:
 	@docker-compose -p janus down
-clean-data: 
+stop-clean-data:
 	@docker-compose -p janus down -v
 clean-images:
 	@docker rmi `docker images -q -f "dangling=true"`
diff --git a/docker-compose.yml b/docker-compose.yml
index f519ca3..7558534 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   # Nginx reverse proxy container
   # Reference:
   # https://github.com/jwilder/nginx-proxy
-  nginx-proxy: # TODO: maybe split this to the two underlying images?
+  nginx-proxy:
     image: jwilder/nginx-proxy
     container_name: nginx-proxy
     restart: always
@@ -57,7 +57,10 @@ services:
   # Reference:
   # https://jenkins.io/doc/book/blueocean/
   jenkins:
-    build: ./jenkins
+    build:
+      dockerfile: ./jenkins
+      args:
+        HOST_DOCKER_VERSION: ${HOST_DOCKER_VERSION:-19.03.5}
     container_name: jenkins
     restart: always
     user: root
@@ -82,7 +85,7 @@ networks:
   apella-net:
     driver: bridge
 # Secrets in use
-secrets: # TODO: figure out a better way to do this?
+secrets:
   jenkins_admin_username:
     file: ./jenkins/user
   jenkins_admin_password:
diff --git a/install.sh b/install.sh
index 8adff69..4907cf0 100755
--- a/install.sh
+++ b/install.sh
@@ -32,6 +32,6 @@ if [[ "$SHOULD_EXIT" = "1" ]]; then
 fi
 
 # Installs docker using the get.docker.com method
-HOST_DOCKER_VERSION="18.09"
+HOST_DOCKER_VERSION="19.03.5"
 VERSION=$HOST_DOCKER_VERSION
 curl -fsSL https://get.docker.com -o get-docker.sh | sh
diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile
index 7bd6bd6..ab9330f 100644
--- a/jenkins/Dockerfile
+++ b/jenkins/Dockerfile
@@ -11,7 +11,8 @@ RUN chown -R jenkins:jenkins /var/cache/jenkins
 
 # Installs docker inside container
 # ATENTION: version MUST be the same as host's docker installation!
-ARG VERSION=$HOST_DOCKER_VERSION
+ARG HOST_DOCKER_VERSION
+ENV VERSION=$HOST_DOCKER_VERSION
 RUN curl -fsSL https://get.docker.com -o get-docker.sh | sh
 
 # Installs tools needed when installing npm packages