From eaf53585de5e790c460abfe5e2bc788065a16abb Mon Sep 17 00:00:00 2001
From: Dieter Reuter <dieter.reuter@me.com>
Date: Sun, 14 Jul 2019 16:52:40 +0200
Subject: [PATCH] Downgrade Docker Compose to the latest easy installable
 version

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
---
 Dockerfile                                    |  2 +-
 builder/chroot-script.sh                      | 23 +++++++------------
 .../hypriotos-image/docker-compose_spec.rb    |  2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1761127..3e16b8f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ENV FETCH_MISSING_ARTIFACTS=true \
     RAW_IMAGE_ARTIFACT=rpi-raw.img.zip \
     DOCKER_ENGINE_VERSION="5:18.09.7~3-0~debian-stretch" \
     CONTAINERD_IO_VERSION="1.2.6-3" \
-    DOCKER_COMPOSE_VERSION="1.24.1" \
+    DOCKER_COMPOSE_VERSION="1.23.1" \
     DOCKER_MACHINE_VERSION="0.16.1" \
     KERNEL_VERSION="4.19.58" \
     ROOTFS_TAR_CHECKSUM="4437ac3ab8278a4a3994aa9aa36f0f00bc409f80ebdffef23a141dfc0286ecb0" \
diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh
index 6d951cd..fffa332 100644
--- a/builder/chroot-script.sh
+++ b/builder/chroot-script.sh
@@ -256,21 +256,14 @@ chmod +x /usr/local/bin/docker-machine
 # install bash completion for Docker Machine
 curl -sSL "https://raw.githubusercontent.com/docker/machine/v${DOCKER_MACHINE_VERSION}/contrib/completion/bash/docker-machine.bash" -o /etc/bash_completion.d/docker-machine
 
-#---DISABLE DOCKER COMPOSE---
-# # install Docker Compose via pip
-# apt-get install -y \
-#   build-essential libffi-dev libssl-dev python python-dev
-# curl -sSL https://bootstrap.pypa.io/get-pip.py | python
-# pip install docker-compose=="${DOCKER_COMPOSE_VERSION}"
-# apt-get purge -y \
-#   build-essential libffi-dev libssl-dev python-dev
-# apt-get autoremove -y --purge
-# apt-get autoclean
-# apt-get clean
-#
-# # install bash completion for Docker Compose
-# curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VERSION}/contrib/completion/bash/docker-compose" -o /etc/bash_completion.d/docker-compose
-#---DISABLE DOCKER COMPOSE---
+# install Docker Compose via pip
+apt-get install -y \
+  python
+curl -sSL https://bootstrap.pypa.io/get-pip.py | python
+pip install docker-compose=="${DOCKER_COMPOSE_VERSION}"
+
+# install bash completion for Docker Compose
+curl -sSL "https://raw.githubusercontent.com/docker/compose/${DOCKER_COMPOSE_VERSION}/contrib/completion/bash/docker-compose" -o /etc/bash_completion.d/docker-compose
 
 echo "Installing rpi-serial-console script"
 wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
diff --git a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb b/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb
index b6f9f63..0368d30 100644
--- a/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb
+++ b/builder/test-integration/spec/hypriotos-image/docker-compose_spec.rb
@@ -7,7 +7,7 @@
 end
 
 describe command('docker-compose --version') do
-  its(:stdout) { should match /1.24.1/m }
+  its(:stdout) { should match /1.23.1/m }
   its(:exit_status) { should eq 0 }
 end