Skip to content

Commit

Permalink
Fix CI versions for incompatible Compose
Browse files Browse the repository at this point in the history
- Docker Compose 2.24 broke behaviour we rely on for merging .env files. Versions since 2.27.1 restore this funcitonality: docker/compose#11824
  • Loading branch information
aequitas committed Jun 5, 2024
1 parent e94de9a commit 904040c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
jobs:
# builds all docker images in parallel
build-docker:
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04

strategy:
matrix:
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
retention-days: 1

docs:
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
needs: [build-docker]
steps:
- name: Branch deployment docs
Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:
sudo apt-get update
# upgrade Docker
sudo apt install --upgrade docker-ce
sudo apt install --upgrade docker-ce docker-compose-plugin
- name: Enable ip6tables in Docker
run: |
Expand Down Expand Up @@ -360,7 +360,7 @@ jobs:
lintcheck:
name: lint/check
needs: [build-docker]
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04

env:
# used in `docker-compose.yml` files to determine version of images to pull
Expand Down Expand Up @@ -397,7 +397,7 @@ jobs:

test:
needs: [build-docker]
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04

env:
# used in `docker-compose.yml` files to determine version of images to pull
Expand Down Expand Up @@ -450,7 +450,7 @@ jobs:

development-environment-test:
needs: [build-docker]
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04

env:
# used in `docker-compose.yml` files to determine version of images to pull
Expand Down Expand Up @@ -562,7 +562,7 @@ jobs:
sudo apt-get update
# upgrade Docker
sudo apt install --upgrade docker-ce
sudo apt install --upgrade docker-ce docker-compose-plugin
- name: Enable ip6tables in Docker
run: |
Expand Down

0 comments on commit 904040c

Please sign in to comment.