From 4448e84e8919b70d0dc2a69ce7ab4630c4fc7269 Mon Sep 17 00:00:00 2001
From: Vitaliy <vitaliyf@users.noreply.github.com>
Date: Sat, 24 Feb 2024 10:14:16 -0500
Subject: [PATCH] Use podman-compose for local development.

---
 .github/workflows/ci-node.yml       | 12 ++++++------
 README.md                           |  4 +++-
 docker-compose.yaml => compose.yaml |  4 +---
 package.json                        |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename docker-compose.yaml => compose.yaml (82%)

diff --git a/.github/workflows/ci-node.yml b/.github/workflows/ci-node.yml
index 36bb825..9372e4e 100644
--- a/.github/workflows/ci-node.yml
+++ b/.github/workflows/ci-node.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16'
-          cache: 'yarn'
+          cache: yarn
       - name: Install dependencies
         run: yarn install --immutable --prefer-offline
       - name: Check types
@@ -38,17 +38,17 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16'
-          cache: 'yarn'
+          cache: yarn
       - name: Install dependencies
         run: yarn install --immutable --prefer-offline
       - name: Build dependencies
         run: yarn build
-      - name: Start grafana docker
-        run: yarn server -d
+      - name: Start Grafana container
+        run: docker-compose --file compose.yaml up --detach
       - name: Run e2e tests
         run: yarn e2e
-      - name: Stop grafana docker
-        run: docker-compose down
+      - name: Stop Grafana container
+        run: docker-compose --file compose.yaml down
 
   build:
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index 1e90385..28e6258 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,15 @@
 # Embrace Metric Grafana Plugin
 
 ## Development Process
+
 1. Clone the repo
 2. Run `yarn install`
-3. Start Docker
+3. Start container with `podman-compose up`
 4. Run `yarn dev` to start the dev server
 5. Run `yarn server` to serve up the plugin on localhost:3000
 
 ## Submission Process 
+
 1. Create a new release: https://github.com/embrace-io/grafana-metric-plugin/releases
 2. When the build is finished, locate the artifact under the Releases page
 3. On [Plugins](https://grafana.com/orgs/embraceio/plugins) page, click "Submit plugin updade" and provide the following for the submission update:
diff --git a/docker-compose.yaml b/compose.yaml
similarity index 82%
rename from docker-compose.yaml
rename to compose.yaml
index 09bf7a1..2219bff 100644
--- a/docker-compose.yaml
+++ b/compose.yaml
@@ -1,8 +1,6 @@
-version: '3.0'
-
 services:
   grafana:
-    container_name: 'embrace-embrace-app'
+    container_name: 'embrace-grafana'
     build:
       context: ./.config
       args:
diff --git a/package.json b/package.json
index dd53e1e..e11bd1a 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "lint:fix": "yarn lint --fix",
     "e2e": "yarn cypress install && yarn grafana-e2e run",
     "e2e:update": "yarn cypress install && yarn grafana-e2e run --update-screenshots",
-    "server": "docker-compose up --build",
+    "server": "podman-compose up --build",
     "sign": "npx --yes @grafana/sign-plugin"
   },
   "author": "Embrace",