From 22c995481264efba8936342101c2b340c1a8f430 Mon Sep 17 00:00:00 2001
From: Alexey Kostevich <akostevich@atlassian.com>
Date: Fri, 9 Aug 2024 14:43:10 +1000
Subject: [PATCH 1/3] NONE: Update the app key for local development

---
 .env.example | 4 +++-
 .env.test    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 61d44c55..85d3df49 100644
--- a/.env.example
+++ b/.env.example
@@ -5,8 +5,10 @@
 # 3. Use a created domain as APP_URL (e.g., https://foo-bar-baz.ngrok-free.app).
 APP_URL=
 # A unique key to identify the app.
+# Use the default value, which corresponds to the app key in Atlassian Marketplace, or a custom one (e.g., `com.figma.jira-add-on-jsmith`)
+# if you need to install a locally running app side by side with the one from Atlassian Marketplace.
 # See for more detail: https://developer.atlassian.com/cloud/jira/platform/connect-app-descriptor/
-APP_KEY=com.figma.jira-add-on-dev
+APP_KEY=com.figma.jira-add-on
 
 # A port the server should listen on.
 SERVER_PORT=3000
diff --git a/.env.test b/.env.test
index cfab0021..660c0528 100644
--- a/.env.test
+++ b/.env.test
@@ -1,5 +1,5 @@
 APP_URL=https://figma-for-jira.figma.com
-APP_KEY=com.figma.jira-add-on-dev-test
+APP_KEY=com.figma.jira-add-on
 
 SERVER_PORT=3000
 

From 634607ec09c9407f9dc44ae23c5617879fd68555 Mon Sep 17 00:00:00 2001
From: Alexey Kostevich <akostevich@atlassian.com>
Date: Fri, 9 Aug 2024 14:55:40 +1000
Subject: [PATCH 2/3] NONE: Update the app key for local development

---
 .env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 85d3df49..7aa07b3d 100644
--- a/.env.example
+++ b/.env.example
@@ -6,7 +6,7 @@
 APP_URL=
 # A unique key to identify the app.
 # Use the default value, which corresponds to the app key in Atlassian Marketplace, or a custom one (e.g., `com.figma.jira-add-on-jsmith`)
-# if you need to install a locally running app side by side with the one from Atlassian Marketplace.
+# if you want to install a locally running app side by side with the one from Atlassian Marketplace.
 # See for more detail: https://developer.atlassian.com/cloud/jira/platform/connect-app-descriptor/
 APP_KEY=com.figma.jira-add-on
 

From ef92e54d018d36419c1d5af0caa891bf3554fbed Mon Sep 17 00:00:00 2001
From: Alexey Kostevich <akostevich@atlassian.com>
Date: Fri, 9 Aug 2024 14:59:56 +1000
Subject: [PATCH 3/3] NONE: Fix CI

---
 scripts/start-sandbox.sh | 2 +-
 scripts/stop-sandbox.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/start-sandbox.sh b/scripts/start-sandbox.sh
index 821f47c3..ba2add23 100755
--- a/scripts/start-sandbox.sh
+++ b/scripts/start-sandbox.sh
@@ -14,7 +14,7 @@ else
   COMPOSE_PROJECT=development
 fi
 
-docker-compose --project-name "$COMPOSE_PROJECT" --file "$COMPOSE_FILE" --env-file "$ENV_FILE" up --detach
+docker compose --project-name "$COMPOSE_PROJECT" --file "$COMPOSE_FILE" --env-file "$ENV_FILE" up --detach
 
 echo 'Waiting for Postgres...'
 until [ "$(docker inspect -f '{{.State.Health.Status}}' "$DB_CONTAINER_NAME")" == "healthy" ]; do
diff --git a/scripts/stop-sandbox.sh b/scripts/stop-sandbox.sh
index 86277196..efe68927 100755
--- a/scripts/stop-sandbox.sh
+++ b/scripts/stop-sandbox.sh
@@ -13,4 +13,4 @@ else
 fi
 
 echo 'Stopping app sandbox'
-docker-compose --project-name "$COMPOSE_PROJECT" --file "$COMPOSE_FILE" --env-file="$ENV_FILE" down
+docker compose --project-name "$COMPOSE_PROJECT" --file "$COMPOSE_FILE" --env-file="$ENV_FILE" down