Skip to content

Commit 280f406

Browse files
committed
Merge branch 'docker-compose-cmd' into action-support
2 parents 8662467 + d79964a commit 280f406

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.github/workflows/tests.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,12 @@ jobs:
1111
- name: Checkout code
1212
uses: actions/checkout@v4
1313

14+
- name: Login to Registry
15+
uses: docker/login-action@v3
16+
with:
17+
registry: ghcr.io
18+
username: ${{ github.repository_owner }}
19+
password: ${{ github.token }}
20+
1421
- name: Workbench up
15-
uses: ./
22+
uses: ./

cmd/util.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ func buildDockerComposeCommand(cfg Config, args ...string) []string {
6666
profiles := getComposeProfiles(cfg)
6767

6868
dockerComposeCmd := []string{
69-
"docker-compose",
69+
"docker",
70+
"compose",
7071
"--env-file",
7172
"defaults.env",
7273
}

0 commit comments

Comments
 (0)