fix: declaring .env file in include directive explicitly (#107)

epam · May 13, 2024 · 3718f2e · 3718f2e
1 parent 51635d8
commit 3718f2e
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 51 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,30 +13,30 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           submodules: true
-      - uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+      - uses: isbang/compose-action@802a148945af6399a338c7906c267331b39a71af # v2.0.0
         with:
-          compose-file: "./dial-cookbook/ci/docker-compose.yml"
+          cwd: "./dial-cookbook/ci"
           up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300"
 
   run-quickstart:
     name: Run quickstart examples
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+      - uses: isbang/compose-action@802a148945af6399a338c7906c267331b39a71af # v2.0.0
         name: Run quickstart model example
         with:
-          compose-file: "./dial-docker-compose/ci/model/docker-compose.yml"
+          cwd: "./dial-docker-compose/ci/model"
           up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300"
-      - uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+      - uses: isbang/compose-action@802a148945af6399a338c7906c267331b39a71af # v2.0.0
         name: Run quickstart application example
         with:
-          compose-file: "./dial-docker-compose/ci/application/docker-compose.yml"
+          cwd: "./dial-docker-compose/ci/application"
           up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300"
-      - uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+      - uses: isbang/compose-action@802a148945af6399a338c7906c267331b39a71af # v2.0.0
         name: Run quickstart addon example
         with:
-          compose-file: "./dial-docker-compose/ci/addon/docker-compose.yml"
+          cwd: "./dial-docker-compose/ci/addon"
           up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300"
 
   build:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,30 +13,30 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           submodules: true
-      - uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+      - uses: isbang/compose-action@802a148945af6399a338c7906c267331b39a71af # v2.0.0
         with:
-          compose-file: "./dial-cookbook/ci/docker-compose.yml"
+          cwd: "./dial-cookbook/ci"
           up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300"
 
   run-quickstart:
     name: Run quickstart examples
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+      - uses: isbang/compose-action@802a148945af6399a338c7906c267331b39a71af # v2.0.0
         name: Run quickstart model example
         with:
-          compose-file: "./dial-docker-compose/ci/model/docker-compose.yml"
+          cwd: "./dial-docker-compose/ci/model"
           up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300"
-      - uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+      - uses: isbang/compose-action@802a148945af6399a338c7906c267331b39a71af # v2.0.0
         name: Run quickstart application example
         with:
-          compose-file: "./dial-docker-compose/ci/application/docker-compose.yml"
+          cwd: "./dial-docker-compose/ci/application"
           up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300"
-      - uses: isbang/compose-action@178aeba5c9dbeed89ffffbb3e6548ec08e9839cf # v1.5.1
+      - uses: isbang/compose-action@802a148945af6399a338c7906c267331b39a71af # v2.0.0
         name: Run quickstart addon example
         with:
-          compose-file: "./dial-docker-compose/ci/addon/docker-compose.yml"
+          cwd: "./dial-docker-compose/ci/addon"
           up-flags: "--abort-on-container-exit --exit-code-from test --timeout 300"
 
   build-and-deploy:

diff --git a/dial-cookbook/ci/docker-compose.yml b/dial-cookbook/ci/docker-compose.yml
@@ -1,8 +1,6 @@
----
-version: '3'
-
 include:
-  - ../docker-compose.yml
+  - path: ../docker-compose.yml
+    env_file: ./.env
 
 services:
   test:

diff --git a/dial-cookbook/docker-compose.yml b/dial-cookbook/docker-compose.yml
@@ -1,8 +1,6 @@
----
-version: '3'
-
 include:
-  - ../dial-docker-compose/common.yml
+  - path: ../dial-docker-compose/common.yml
+    env_file: ./.env
 
 services:
   echo:

diff --git a/dial-docker-compose/addon/docker-compose.yml b/dial-docker-compose/addon/docker-compose.yml
@@ -1,8 +1,6 @@
----
-version: '3'
-
 include:
-  - ../common.yml
+  - path: ../common.yml
+    env_file: ./.env
 
 services:
   adapter-openai:

diff --git a/dial-docker-compose/application/docker-compose.yml b/dial-docker-compose/application/docker-compose.yml
@@ -1,8 +1,6 @@
----
-version: '3'
-
 include:
-  - ../common.yml
+  - path: ../common.yml
+    env_file: ./.env
 
 services:
   echo:

diff --git a/dial-docker-compose/ci/addon/docker-compose.yml b/dial-docker-compose/ci/addon/docker-compose.yml
@@ -1,8 +1,6 @@
----
-version: '3'
-
 include:
-  - ../../addon/docker-compose.yml
+  - path: ../../addon/docker-compose.yml
+    env_file: ./.env
 
 services:
   azure_deployment_host:

diff --git a/dial-docker-compose/ci/application/docker-compose.yml b/dial-docker-compose/ci/application/docker-compose.yml
@@ -1,8 +1,6 @@
----
-version: '3'
-
 include:
-  - ../../application/docker-compose.yml
+  - path: ../../application/docker-compose.yml
+    env_file: ./.env
 
 services:
   test:

diff --git a/dial-docker-compose/ci/model/docker-compose.yml b/dial-docker-compose/ci/model/docker-compose.yml
@@ -1,8 +1,6 @@
----
-version: '3'
-
 include:
-  - ../../model/docker-compose.yml
+  - path: ../../model/docker-compose.yml
+    env_file: ./.env
 
 services:
   azure_deployment_host:

diff --git a/dial-docker-compose/common.yml b/dial-docker-compose/common.yml
@@ -1,6 +1,3 @@
----
-version: '3'
-
 services:
   themes:
     image: epam/ai-dial-chat-themes:0.4.0

diff --git a/dial-docker-compose/model/docker-compose.yml b/dial-docker-compose/model/docker-compose.yml
@@ -1,8 +1,6 @@
----
-version: '3'
-
 include:
-  - ../common.yml
+  - path: ../common.yml
+    env_file: ./.env
 
 services:
   adapter-openai: