From 095ddf0e2d23bea1f8a7451bf5ae6197c93e7b64 Mon Sep 17 00:00:00 2001 From: jpfleischer Date: Sat, 19 Oct 2024 00:02:56 -0400 Subject: [PATCH] Revert to docker successfully installing --- .github/workflows/dockerbuild.yml | 32 +++++++++++++------------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 9c0d8f58b..90a2da42d 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -41,24 +41,18 @@ jobs: uname -a uname -m - # Install Homebrew - - name: Install Homebrew + - name: Setup docker, docker-compose, and colima (missing on MacOS) + if: runner.os == 'macos' run: | - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - - # Install Docker and Docker Compose - - name: Install Docker and Docker Compose - run: | - brew install --cask docker - brew install docker-compose - - # Start Docker - - name: Start Docker Service - run: | - open /Applications/Docker.app - while ! docker system info > /dev/null 2>&1; do sleep 1; done - - # Run Docker commands - - name: Run a Docker container + brew install docker docker-compose colima + + # Link the Docker Compose v2 plugin so it's understood by the docker CLI + mkdir -p ~/.docker/cli-plugins + ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose + + colima start + + - name: try doing docker build + shell: bash -l {0} run: | - docker run hello-world \ No newline at end of file + docker build -t emission-server . \ No newline at end of file