Skip to content

Commit

Permalink
fix(ci): correct docker-compose install
Browse files Browse the repository at this point in the history
The base actions image no longer appears to include an old version of
`docker-compose` so there's no thing to replace. Switch to installing
`docker-compose` in a directory alongside the `docker` binary.

Also bump docker-compose to the latest release whilst making changes
here.

Signed-off-by: Dominic Evans <dominic.evans@uk.ibm.com>
  • Loading branch information
dnwe committed Aug 7, 2024
1 parent 6b4f9be commit 08ded32
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/fvt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
go-version: ${{ inputs.go-version }}
- name: Setup Docker Compose
run: |
curl -sSL "https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose
sudo install -m755 /tmp/docker-compose "$(dirname $(which docker-compose))"
curl --fail -sSL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose
sudo install -m755 /tmp/docker-compose "$(dirname $(which docker))"
docker version --format 'Docker Engine version v{{.Server.Version}}'
docker-compose version
- name: Test (Functional)
Expand Down

0 comments on commit 08ded32

Please sign in to comment.