Start colima manually

River-Kt · Feb 26, 2024 · 6b261ed · 6b261ed
1 parent 6997683
commit 6b261ed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 26 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,24 +17,8 @@ jobs:
           - module: Apache Kafka
             path: :connector:connector-apache:connector-apache-kafka
             containers: zookeeper kafka
-          - module: AWS Lambda
-            path: :connector:connector-aws:connector-aws-lambda
-            containers: localstack
-            runner: macos-latest
-          - module: AWS S3
-            path: :connector:connector-aws:connector-aws-s3
-            containers: localstack
-            runner: macos-latest
-          - module: AWS SES
-            path: :connector:connector-aws:connector-aws-ses
-            containers: localstack
-            runner: macos-latest
-          - module: AWS SNS
-            path: :connector:connector-aws:connector-aws-sns
-            containers: localstack
-            runner: macos-latest
-          - module: AWS SQS
-            path: :connector:connector-aws:connector-aws-sqs
+          - module: AWS (lambda, s3, ses, sqs, sns)
+            path: :connector:connector-aws
             containers: localstack
             runner: macos-latest
           - module: Azure Queue Storage
@@ -83,14 +67,17 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Docker [macOS only]
-        if: ${{ matrix.containers && matrix.runner == 'macos-latest' }}
-        uses: douglascamata/setup-docker-macos-action@v1-alpha
-      - name: Run docker-compose [if needed] [macOS only]
-        if: ${{ matrix.containers && matrix.runner == 'macos-latest' }}
-        run: docker-compose up ${{ matrix.containers }} -d
+      - name: Install Docker [if needed] [macOS only]
+        if: ${{ matrix.containers && runner.os == 'macos' }}
+        run: |
+          brew install docker docker-compose
+          mkdir -p ~/.docker/cli-plugins
+          ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose
+      - name: Run Colima [if needed] [macOS only]
+        if: ${{ matrix.containers && runner.os == 'macos' }}
+        run: colima start --cpu 2 --memory 4 --mount-type 9p --network-address
       - name: Run docker-compose [if needed]
-        if: ${{ matrix.containers && matrix.runner != 'macos-latest' }}
+        if: ${{ matrix.containers }}
         run: docker compose up ${{ matrix.containers }} -d
       - name: Set up JDK 17
         uses: actions/setup-java@v4

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,7 +22,6 @@ services:
       - LAMBDA_EXECUTOR=local
     volumes:
       - './stub/localstack/:/etc/localstack/init/ready.d/'
-      - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
       - "/var/run/docker.sock:/var/run/docker.sock"
 
   rabbitmq: