Merge branch 'docker-compose-cmd' into action-support

Author: tcarmet

.github/workflows/tests.yaml

@@ -11,5 +11,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ github.token }}
+
       - name: Workbench up
-        uses: ./
+        uses: ./

action.yaml

@@ -3,12 +3,12 @@ name: Workbench Up
 description: "Run workbench up with default configuration to start S3C workbench environment"
 
 inputs:
-  environment:
+  name:
     description: "Name of the environment to start (defaults to 'default')"
     required: false
     default: "default"
-  environment-dir:
-    description: "Directory to store the environment"
+  env-dir:
+    description: "Directory where the environment is stored"
     required: false
     default: "env"
   build:
@@ -38,9 +38,10 @@ runs:
 
     - name: Start workbench environment
       shell: bash
-      run: >
-        workbench up
-          --name ${{ inputs.environment }}
-          --env-dir ${{ inputs.environment-dir }}
-          ${{ inputs.build == 'true' && '--build' || '' }}
+      run: |
+        workbench up \
+          --detach \
+          --name ${{ inputs.name }} \
+          --env-dir ${{ inputs.env-dir }} \
+          ${{ inputs.build == 'true' && '--build' || '' }} \
           ${{ inputs.no-cache == 'true' && '--no-cache' || '' }}

cmd/util.go

@@ -66,7 +66,8 @@ func buildDockerComposeCommand(cfg Config, args ...string) []string {
 	profiles := getComposeProfiles(cfg)
 
 	dockerComposeCmd := []string{
-		"docker-compose",
+		"docker",
+		"compose",
 		"--env-file",
 		"defaults.env",
 	}