Skip to content

Commit 1386728

Browse files
authored
Merge pull request #153 from quickwit-oss/fmassot/grafana-11
Fix docker compose command in CI, use grafana oss 11 version in docker
2 parents 2263172 + 2cfc851 commit 1386728

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

.config/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG grafana_version=latest
2-
ARG grafana_image=grafana-enterprise
2+
ARG grafana_image=grafana-oss
33

44
FROM grafana/${grafana_image}:${grafana_version}
55

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
run: npm run build
3636

3737
- name: Start grafana docker
38-
run: docker-compose up -d
38+
run: docker compose up -d
3939

4040
- name: Run e2e tests
4141
run: npm run e2e
4242

4343
- name: Stop grafana docker
44-
run: docker-compose down
44+
run: docker compose down
4545

4646
- name: Check for backend
4747
id: check-for-backend

.github/workflows/is-compatible.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ jobs:
55
compatibilitycheck:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v3
8+
- uses: actions/checkout@v4
9+
with:
10+
persist-credentials: false
911
- name: Setup Node.js environment
10-
uses: actions/setup-node@v3
12+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
1113
with:
12-
node-version: '16'
14+
node-version: '22'
1315
cache: 'npm'
1416
- name: Install dependencies
1517
run: npm ci
1618
- name: Build plugin
1719
run: npm run build
1820
- name: Compatibility check
19-
run: npx @grafana/levitate@latest is-compatible --path src/module.ts --target @grafana/data@10.0.3,@grafana/ui@10.0.3,@grafana/runtime@10.0.3
21+
uses: grafana/plugin-actions/is-compatible@bf335ac99375f0ba8828497abdf1a22897b5d888
22+
with:
23+
comment-pr: 'yes'
24+
fail-if-incompatible: 'no'
25+
targets: '@grafana/data,@grafana/ui,@grafana/runtime,@grafana/e2e-selectors'

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
build:
1717
context: ./.config
1818
args:
19-
grafana_version: 10.4.0
19+
grafana_version: 11.6.3
2020
ports:
2121
- 3000:3000/tcp
2222
volumes:

0 commit comments

Comments
 (0)