From a2318350a9a8cde2681354abc73dcdf6a9e0b8e3 Mon Sep 17 00:00:00 2001 From: Heorhii Date: Sun, 31 Dec 2023 00:52:11 +0100 Subject: [PATCH] Added different way to setup docker --- .github/workflows/test-macos.yml | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index e63b59b9..119c6bb5 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -24,14 +24,26 @@ jobs: - name: Setup docker (missing on MacOS) if: runner.os == 'macos' run: | - brew install docker - brew install docker-compose - mkdir -p ~/.docker/cli-plugins - ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose - colima start - # For testcontainers to find the Colima socket - # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running - sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock + # brew install docker + # brew install docker-compose + # mkdir -p ~/.docker/cli-plugins + # ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose + # docker --version + # dockerd --unprivileged + # docker info + + # colima start + # # For testcontainers to find the Colima socket + # # https://github.com/abiosoft/colima/blob/main/docs/FAQ.md#cannot-connect-to-the-docker-daemon-at-unixvarrundockersock-is-the-docker-daemon-running + # sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock + + # https://desktop.docker.com/mac/main/arm64/Docker.dmg + $DI_URL=https://desktop.docker.com/mac/main/amd64/Docker.dmg + curl -o Docker.dmg $DI_URL + # softwareupdate --install-rosetta + sudo hdiutil attach Docker.dmg + sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license + sudo hdiutil detach /Volumes/Docker - name: Setup pg (on Windows) if: runner.os == 'windows'