Change docker version used

makefile → 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"`

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:

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

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