Fix: Make docker-compose cwd aware

hoverkraft-tech · Dec 6, 2023 · 11a3473 · 11a3473
1 parent 178aeba
commit 11a3473
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 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/post.js b/post.js
@@ -18,6 +18,7 @@ try {
 
   const options = {
     config: composeFiles,
+    cwd: core.getInput("cwd"),
     log: true,
     composeOptions: utils.parseFlags(core.getInput("compose-flags")),
     commandOptions: utils.parseFlags(core.getInput("down-flags")),

diff --git a/utils.js b/utils.js
@@ -15,7 +15,7 @@ module.exports.parseComposeFiles = (composeFiles) => {
     }
 
     if (!fs.existsSync(composeFile)) {
-      console.log(`${composeFile} not exists`);
+      console.log(`${composeFile} does not exist`);
       return false;
     }