From c3457a4c8aa4e6f0d2f60a9d83ce23f5ded4608d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 17 Aug 2022 13:30:53 +0200
Subject: [PATCH] fix: revert docker compose version to 2.6.1

---
 Dockerfile                             | 3 ++-
 apps/api/src/jobs/deployApplication.ts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 778d46764..fea6b8624 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,8 @@ RUN mkdir -p ~/.docker/cli-plugins/
 # https://download.docker.com/linux/static/stable/
 RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-20.10.9 -o /usr/bin/docker
 # https://github.com/docker/compose/releases
-RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.7.0 -o ~/.docker/cli-plugins/docker-compose
+# Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
+RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.6.1 -o ~/.docker/cli-plugins/docker-compose
 RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker
 
 RUN (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.27.0/pack-v0.27.0-linux.tgz" | tar -C /usr/local/bin/ --no-same-owner -xzv pack)
diff --git a/apps/api/src/jobs/deployApplication.ts b/apps/api/src/jobs/deployApplication.ts
index a8c46d594..e258edfb9 100644
--- a/apps/api/src/jobs/deployApplication.ts
+++ b/apps/api/src/jobs/deployApplication.ts
@@ -255,11 +255,11 @@ import * as buildpacks from '../lib/buildPacks';
 								secrets.forEach((secret) => {
 									if (pullmergeRequestId) {
 										if (secret.isPRMRSecret) {
-											envs.push(`${secret.name}='${secret.value}'`);
+											envs.push(`${secret.name}=${secret.value}`);
 										}
 									} else {
 										if (!secret.isPRMRSecret) {
-											envs.push(`${secret.name}='${secret.value}'`);
+											envs.push(`${secret.name}=${secret.value}`);
 										}
 									}
 								});