Skip to content

Commit 6d2b752

Browse files
authored
Fix docker compose in CI (#79)
* add api client with grpc kotlin * add new docker compose * grant permission * another try * update the compose * try a new colima docker * more tries * another try * a different version * update version * clean up docker start * try npm * more testing * stop it first * try again with compose * add back -d * add back test * small test fixes * revert * try macos 11' git st * remove platform line * try with latest * remove -p * add back -p * remove uneeded husky * fix up spacing
1 parent caf88b2 commit 6d2b752

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

.github/workflows/test.yml

+4-14
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,10 @@ jobs:
4444
uses: gradle/gradle-build-action@v2
4545
- name: Validate Gradle Wrapper
4646
uses: gradle/wrapper-validation-action@v1
47-
- name: Install docker
48-
run: |
49-
mkdir -p ~/.docker/machine/cache
50-
curl -Lo ~/.docker/machine/cache/boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v19.03.12/boot2docker.iso
51-
brew install docker docker-compose
52-
- name: Start colima
53-
run: |
54-
# Docker engine is no longer available because of licensing
55-
# Alternative Colima is part of the github macOS runner
56-
colima start
57-
# Ensure colima is configured for later user
58-
echo "DOCKER_HOST=unix://$HOME/.colima/default/docker.sock" >> $GITHUB_ENV
59-
# Verify Docker
60-
docker ps
47+
- name: Set up Docker
48+
run: brew install docker docker-compose
49+
- name: Start Colima
50+
run: colima start
6151
- name: Start local test server
6252
run: docker-compose -p xmtp -f dev/local/docker-compose.yml up -d
6353
- name: Gradle Run Integration Tests

dev/local/docker-compose.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
version: "3.8"
22
services:
33
wakunode:
4-
image: xmtp/node-go
5-
platform: linux/amd64
4+
image: xmtp/node-go:latest
65
environment:
76
- GOWAKU-NODEKEY=8a30dcb604b0b53627a5adc054dbf434b446628d4bd1eccc681d223f0550ce67
87
command:
@@ -22,7 +21,7 @@ services:
2221
depends_on:
2322
- db
2423
healthcheck:
25-
test: ["CMD", "lsof", "-i", ":5556"]
24+
test: [ "CMD", "lsof", "-i", ":5556" ]
2625
interval: 3s
2726
timeout: 10s
2827
retries: 5

0 commit comments

Comments
 (0)