refactor: use docker compose recommendations (getredash#5854)

Signed-off-by: Lucas Fernando Cardoso Nunes <[email protected]>
eradman · Feb 4, 2024 · af2f4af · af2f4af
1 parent 49a5e74
commit af2f4af
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/.ci/docker-compose.ci.yml → .ci/compose.ci.yaml b/.ci/docker-compose.ci.yml → .ci/compose.ci.yaml
@@ -1,4 +1,3 @@
-version: '2.2'
 services:
   redash:
     build: ../

diff --git a/.ci/docker-compose.cypress.yml → .ci/compose.cypress.yaml b/.ci/docker-compose.cypress.yml → .ci/compose.cypress.yaml
@@ -1,4 +1,3 @@
-version: "2.2"
 x-redash-service: &redash-service
   build:
     context: ../

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: backend-lint
     env:
-      COMPOSE_FILE: .ci/docker-compose.ci.yml
+      COMPOSE_FILE: .ci/compose.ci.yaml
       COMPOSE_PROJECT_NAME: redash
       COMPOSE_DOCKER_CLI_BUILD: 1
       DOCKER_BUILDKIT: 1
@@ -127,7 +127,7 @@ jobs:
     runs-on: ubuntu-22.04
     needs: frontend-lint
     env:
-      COMPOSE_FILE: .ci/docker-compose.cypress.yml
+      COMPOSE_FILE: .ci/compose.cypress.yaml
       COMPOSE_PROJECT_NAME: cypress
       CYPRESS_INSTALL_BINARY: 0
       PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 1

diff --git a/docker-compose.yml → compose.yaml b/docker-compose.yml → compose.yaml
@@ -1,6 +1,5 @@
 # This configuration file is for the **development** setup.
 # For a production example please refer to getredash/setup repository on GitHub.
-version: "2.2"
 x-redash-service: &redash-service
   build:
     context: .