From e2a56c47daa924a368c0c8b81e6ec80d5d99ecdb Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 13 Jul 2018 11:26:07 +0200
Subject: [PATCH 1/2] Update CircleCI Docker version to 18.03

17.06 has reached EOL a long time ago; let's use a current
version in CI as well :D

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 circle.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/circle.yml b/circle.yml
index 53fcac7389..624e5312f5 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,7 +4,7 @@ jobs:
 
   lint:
     working_directory: /work
-    docker: [{image: 'docker:17.06-git'}]
+    docker: [{image: 'docker:18.03-git'}]
     steps:
       - checkout
       - setup_remote_docker:
@@ -22,7 +22,7 @@ jobs:
 
   cross:
     working_directory: /work
-    docker: [{image: 'docker:17.06-git'}]
+    docker: [{image: 'docker:18.03-git'}]
     parallelism: 3
     steps:
       - checkout
@@ -48,7 +48,7 @@ jobs:
 
   test:
     working_directory: /work
-    docker: [{image: 'docker:17.06-git'}]
+    docker: [{image: 'docker:18.03-git'}]
     steps:
       - checkout
       - setup_remote_docker:
@@ -76,7 +76,7 @@ jobs:
 
   validate:
     working_directory: /work
-    docker: [{image: 'docker:17.06-git'}]
+    docker: [{image: 'docker:18.03-git'}]
     steps:
       - checkout
       - setup_remote_docker:
@@ -93,7 +93,7 @@ jobs:
                 make ci-validate
   shellcheck:
     working_directory: /work
-    docker: [{image: 'docker:17.06-git'}]
+    docker: [{image: 'docker:18.03-git'}]
     steps:
       - checkout
       - setup_remote_docker

From 13eb2aa1259a7d65b565b786b2c8b576123e021e Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Fri, 13 Jul 2018 11:46:31 +0200
Subject: [PATCH 2/2] Configure CircleCI remote daemon to use version 18.03.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 circle.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 624e5312f5..073d4cf69e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -8,6 +8,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
+            version: 18.03.1-ce
             reusable: true
             exclusive: false
       - run:
@@ -27,6 +28,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
+            version: 18.03.1-ce
             reusable: true
             exclusive: false
       - run:
@@ -52,6 +54,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
+            version: 18.03.1-ce
             reusable: true
             exclusive: false
       - run:
@@ -80,6 +83,7 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker:
+            version: 18.03.1-ce
             reusable: true
             exclusive: false
       - run:
@@ -96,7 +100,10 @@ jobs:
     docker: [{image: 'docker:18.03-git'}]
     steps:
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+            version: 18.03.1-ce
+            reusable: true
+            exclusive: false
       - run:
           name: "Run shellcheck"
           command: |