Skip to content

Commit bcc0246

Browse files
author
Diego Rondini
committed
Fix setup of docker on Mac OS runner
Switch to a different action to install docker on Mac OS, the current one seems to be problematic. https://github.com/marketplace/actions/setup-docker-on-macos Useful references about the issue: actions/runner-images#17 docker-practice/actions-setup-docker#29 Signed-off-by: Diego Rondini <[email protected]>
1 parent f6f638b commit bcc0246

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/pipeline-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
uses: gradle/actions/setup-gradle@v3
2323

2424
#Run only on macOS
25-
- name: Setup Docker
25+
- name: Setup Docker on macOS
2626
if: ${{ matrix.os == 'macos-13' && github.event_name == 'pull_request' }}
27-
uses: better0fdead/actions-setup-docker@better0fdead/increase-timeout
27+
uses: douglascamata/setup-docker-macos-action@v1-alpha
2828

2929
- name: Set up JDK 17
3030
uses: actions/setup-java@v4

docker/test/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ services:
6969
test: '/bin/sh -c "mysqladmin -u$$MYSQL_USER -P3306 -p$$MYSQL_PASSWORD ping"'
7070
interval: 10s
7171
start_period: 30s
72+
timeout: 2m
73+
retries: 10
7274

7375
# ------------------------------------------------
7476
networks:

0 commit comments

Comments
 (0)