From 8cfd2d16943087e6dd34631612de46cce5adb1a9 Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Wed, 24 Feb 2021 17:00:33 +0100
Subject: [PATCH] WIP: migrate yq commands to V4

---
 setup/setup.sh   | 16 ++++++++--------
 setup/upgrade.sh |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/setup/setup.sh b/setup/setup.sh
index 594f3e21c..756f511dc 100755
--- a/setup/setup.sh
+++ b/setup/setup.sh
@@ -147,7 +147,7 @@ prepare_files()
 }
 
 yq() {
-  docker run --rm -i -v "${FABMANAGER_PATH}:/workdir" mikefarah/yq yq "$@"
+  docker run --rm -i -v "${FABMANAGER_PATH}:/workdir" mikefarah/yq:4 "$@"
 }
 
 prepare_nginx()
@@ -160,16 +160,16 @@ prepare_nginx()
   else
     # if nginx is not installed, remove its associated block from docker-compose.yml
     echo "Removing nginx..."
-    yq d -i docker-compose.yml services.nginx
+    yq -i eval 'del(.services.nginx)' docker-compose.yml
     read -rp "Do you want to map the Fab-manager's service to an external network? (Y/n) " confirm </dev/tty
     if [ "$confirm" != "n" ]; then
       echo "Adding a network configuration to the docker-compose.yml file..."
-      yq w -i docker-compose.yml networks.web.external true
-      yq w -i docker-compose.yml networks.db ''
-      yq w -i docker-compose.yml services.fabmanager.networks[+] web
-      yq w -i docker-compose.yml services.fabmanager.networks[+] db
-      yq w -i docker-compose.yml services.postgres.networks[+] db
-      yq w -i docker-compose.yml services.redis.networks[+] db
+      yq -i eval '.networks.web.external = "true"' docker-compose.yml
+      yq -i eval '.networks.db = ""' docker-compose.yml
+      yq -i eval '.services.fabmanager.networks += ["web"]' docker-compose.yml
+      yq -i eval '.services.fabmanager.networks += ["db"]' docker-compose.yml
+      yq -i eval '.services.postgres.networks += ["db"]' docker-compose.yml
+      yq -i eval '.services.redis.networks += ["db"]' docker-compose.yml
     fi
   fi
 }
diff --git a/setup/upgrade.sh b/setup/upgrade.sh
index 491fe14b5..82d9342d6 100644
--- a/setup/upgrade.sh
+++ b/setup/upgrade.sh
@@ -28,7 +28,7 @@ parseparams()
 }
 
 yq() {
-  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq yq "$@"
+  docker run --rm -i -v "${PWD}:/workdir" mikefarah/yq:3 "$@"
 }
 
 jq() {