From 26873f7352c4d3fdd0c60047d4110f62739093c6 Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel <erik@martin-dorel.org>
Date: Fri, 3 Jul 2020 15:53:48 +0200
Subject: [PATCH 1/2] feat: Use base/single/Dockerfile for tags 4.05.0 and
 4.07.0-flambda

---
 images.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/images.yml b/images.yml
index 71b0642..e7dfe12 100644
--- a/images.yml
+++ b/images.yml
@@ -19,15 +19,23 @@ images:
       tags:
         - tag: '{matrix[tag]}'
   - matrix:
-      # TODO: replace latest with two single switches
-      tag: ['latest']
+      tag: ['4.07.1-flambda']
     build:
       context: './base'
-      dockerfile: './dual/Dockerfile'
+      dockerfile: './single/Dockerfile'
+      args:
+        COMPILER: '4.07.1+flambda'
+        NUM_VERSION: '1.3'
+      tags:
+        - tag: '{matrix[tag]}'
+  - matrix:
+      tag: ['4.05.0']
+    build:
+      context: './base'
+      dockerfile: './single/Dockerfile'
       args:
         COMPILER: '4.05.0'
-        COMPILER_EDGE: '4.07.1+flambda'
-        # TODO: then specify NUM_VERSION
+        NUM_VERSION: '0'
       tags:
         - tag: '{matrix[tag]}'
   - matrix:
@@ -45,9 +53,5 @@ images:
     build:
       context: './base'
       dockerfile: './bare/Dockerfile'
-      args:
-        # TODO: refactor later on
-        COMPILER: '4.05.0'
-        COMPILER_EDGE: '4.07.1+flambda'
       tags:
         - tag: '{matrix[tag]}'

From b843b03cd71eff3a98e75e30af50114480ceb334 Mon Sep 17 00:00:00 2001
From: Erik Martin-Dorel <erik@martin-dorel.org>
Date: Fri, 3 Jul 2020 16:08:10 +0200
Subject: [PATCH 2/2] Squashed 'external/docker-keeper/' changes from
 765dd3e..194dec3

194dec3 fix: check-updates output

git-subtree-dir: external/docker-keeper
git-subtree-split: 194dec34fcbf375529339bade042320a7f3199b9
---
 VERSION                | 2 +-
 gitlab-ci-template.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 1e9b46b..6201b5f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.8.7
+0.8.8
diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index 51476d8..bddb4ac 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -141,7 +141,7 @@ check-updates:
     cat <<EOF
     You need to update docker-keeper : $version -> $upstream, by doing:
       cd \$(git rev-parse --show-toplevel)
-      subtree pull --squash -P $KEEPER_SUBTREE $upstream_repo master
+      git subtree pull --squash -P $KEEPER_SUBTREE $upstream_repo master
     EOF
         false
       else