From a1642a21f3691e6b17993807e096d266521782e6 Mon Sep 17 00:00:00 2001
From: Matej Kubinec <32638572+matejkubinec@users.noreply.github.com>
Date: Tue, 10 Sep 2024 09:31:12 +0200
Subject: [PATCH] PMM-7 Update docker compose file & UI tests pipeline fix
 (#755)

* PMM-7 Update env variable names

* PMM-7 Allow specifying pmm server image through env variable

* PMM-7 UI tests pipeline fix (#769)

* PMM-7 Install playwright for UI tests
---
 .github/workflows/ui-tests.yml | 4 ++++
 Makefile                       | 2 +-
 docker-compose.yml             | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index 20124d235311..33797c40914f 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -68,6 +68,10 @@ jobs:
         working-directory: ./pmm-ui-tests
         run: npm install
 
+      - name: install playwright
+        working-directory: ./pmm-ui-tests
+        run: npx playwright install
+
       - name: Run UI tests
         working-directory: ./pmm-ui-tests
         run: npm run e2e:grafana-pr
diff --git a/Makefile b/Makefile
index 973777333e0a..8a7c17a69c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
 
 run-local-env:               ## Start local frontend with pmm-server:dev-latest
 	yarn dev
-	docker-compose up -d
+	docker compose up -d
 
 ##@ Testing
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 85fe93864f67..e9b36d0405a2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: pmm-server
     # Temporary till we have arm builds
     platform: linux/amd64
-    image: perconalab/pmm-server:3-dev-container
+    image: ${PMM_SERVER_IMAGE:-perconalab/pmm-server:3-dev-container}
     volumes:
       - "./:/workspace"
       - "./public:/usr/share/grafana/public"
@@ -16,8 +16,8 @@ services:
     environment:
       - PMM_DEBUG=1
       - PERCONA_PORTAL_URL=https://portal-dev.percona.com
-      - PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443
-      - PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTkF7Snv08FCboTne4djQfN5qbrLfAjb8SY3/wwEP+X5nUrkxCEvUDJ
+      - PMM_DEV_PERCONA_PLATFORM_ADDRESS=https://check-dev.percona.com:443
+      - PMM_DEV_PERCONA_PLATFORM_PUBLIC_KEY=RWTkF7Snv08FCboTne4djQfN5qbrLfAjb8SY3/wwEP+X5nUrkxCEvUDJ
 
   mysql:
     image: percona:5.7.30