Fix: Make docker-compose cwd aware

hoverkraft-tech · Dec 8, 2023 · ffe16df · ffe16df
1 parent 178aeba
commit ffe16df
Show file tree

Hide file tree

Showing 34 changed files with 289 additions and 2,612 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,29 +16,34 @@ jobs:
       - run: npm install
       - uses: ./
         with:
-          compose-file: "./docker/docker-compose.yml"
+          compose-file: "${{ github.workspace }}/docker/docker-compose.yml"
+          cwd: "${{ github.workspace }}"
           services: |
             helloworld2
             helloworld3
       - uses: ./
         with:
           compose-file: "./docker/docker-compose.yml"
+          cwd: "${{ github.workspace }}"
           down-flags: "--volumes"
       - uses: ./
         with:
           compose-file: "./docker/docker-compose.yml"
           compose-flags: "--profile profile-1"
+          cwd: "${{ github.workspace }}"
           down-flags: "--volumes"
       - uses: ./
         with:
           compose-file: "./docker/docker-compose-with-env.yml"
+          cwd: "${{ github.workspace }}"
         env:
           IMAGE_NAME: hello-world
       - uses: ./
         with:
           compose-file: |
             ./docker/docker-compose.yml
             ./docker/docker-compose.ci.yml
+          cwd: "${{ github.workspace }}"
           services: |
             helloworld2
             helloworld4

diff --git a/action.yml b/action.yml
@@ -9,6 +9,10 @@ inputs:
     description: "additional options to pass to `docker-compose` command"
     required: false
     default: ""
+  cwd: # id of input
+    description: "Current working directory"
+    required: false
+    default: ""
   down-flags: # id of input
     description: "additional options to pass to `docker-compose down` command"
     required: false

diff --git a/main.js b/main.js
@@ -20,6 +20,7 @@ try {
 
   const options = {
     config: composeFiles,
+    cwd: core.getInput("cwd"),
     log: true,
     composeOptions: utils.parseFlags(core.getInput("compose-flags")),
     commandOptions: utils.parseFlags(core.getInput("up-flags")),

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity
diff --git a/node_modules/@eslint-community/eslint-utils/node_modules/.bin/eslint b/node_modules/@eslint-community/eslint-utils/node_modules/.bin/eslint
diff --git a/node_modules/acorn-jsx/node_modules/.bin/acorn b/node_modules/acorn-jsx/node_modules/.bin/acorn
diff --git a/node_modules/cross-spawn/node_modules/.bin/node-which b/node_modules/cross-spawn/node_modules/.bin/node-which
diff --git a/node_modules/docker-compose/CHANGELOG.md b/node_modules/docker-compose/CHANGELOG.md
diff --git a/node_modules/docker-compose/community-samples/readme.md b/node_modules/docker-compose/community-samples/readme.md
diff --git a/node_modules/docker-compose/dist/src/index.d.ts b/node_modules/docker-compose/dist/src/index.d.ts