Skip to content

Commit d0318a3

Browse files
author
andrii.pavliv
committed
feat: updated go libs. Fixed snyk and versioning issues
Signed-off-by: andrii.pavliv <andrii.pavliv@securekey>
1 parent 93431fe commit d0318a3

1 file changed

Lines changed: 16 additions & 26 deletions

File tree

.github/workflows/build.yml

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ jobs:
212212
echo '127.0.0.1 vc-rest-echo.trustbloc.local' | sudo tee -a /etc/hosts
213213
echo '127.0.0.1 api-gateway.trustbloc.local' | sudo tee -a /etc/hosts
214214
echo '127.0.0.1 cognito-mock.trustbloc.local' | sudo tee -a /etc/hosts
215-
- name: Install Docker (Colima) on macOS
215+
- name: Install Docker (Colima) + Compose on macOS
216216
env:
217217
HOMEBREW_NO_INSTALL_CLEANUP: "1"
218218
HOMEBREW_NO_ENV_HINTS: "1"
@@ -221,24 +221,22 @@ jobs:
221221
run: |
222222
set -euxo pipefail
223223
brew update
224-
brew install colima docker docker-buildx
224+
brew install colima docker docker-buildx docker-compose
225225
colima start --cpu 4 --memory 8 --disk 20
226226
docker context use colima
227-
for i in {1..60}; do
228-
if docker info >/dev/null 2>&1; then
229-
break
230-
fi
231-
sleep 2
232-
done
227+
# Ensure compose plugin is visible to "docker compose" and legacy "docker-compose"
228+
mkdir -p ~/.docker/cli-plugins
229+
ln -sf "$(brew --prefix)/opt/docker-compose/bin/docker-compose" ~/.docker/cli-plugins/docker-compose
230+
command -v docker-compose || true
231+
docker compose version
233232
docker version
234233
docker info
234+
235235
- name: Ensure Docker is up (Colima)
236236
run: |
237237
colima status || colima start --cpu 4 --memory 8 --disk 20
238238
for i in {1..60}; do
239-
if docker info >/dev/null 2>&1; then
240-
break
241-
fi
239+
docker info >/dev/null 2>&1 && break
242240
sleep 2
243241
done
244242
docker context inspect
@@ -356,8 +354,7 @@ jobs:
356354
echo '127.0.0.1 api-gateway.trustbloc.local' | sudo tee -a /etc/hosts
357355
echo '127.0.0.1 cognito-mock.trustbloc.local' | sudo tee -a /etc/hosts
358356
359-
# Install Docker CLI and start Colima
360-
- name: Install Docker (Colima) on macOS
357+
- name: Install Docker (Colima) + Compose on macOS
361358
env:
362359
HOMEBREW_NO_INSTALL_CLEANUP: "1"
363360
HOMEBREW_NO_ENV_HINTS: "1"
@@ -366,28 +363,21 @@ jobs:
366363
run: |
367364
set -euxo pipefail
368365
brew update
369-
brew install colima docker docker-buildx
366+
brew install colima docker docker-buildx docker-compose
370367
colima start --cpu 4 --memory 8 --disk 20
371-
# Select context (persists in ~/.docker)
372368
docker context use colima
373-
# Wait until the engine is REALLY ready
374-
for i in {1..60}; do
375-
if docker info >/dev/null 2>&1; then
376-
break
377-
fi
378-
sleep 2
379-
done
369+
mkdir -p ~/.docker/cli-plugins
370+
ln -sf "$(brew --prefix)/opt/docker-compose/bin/docker-compose" ~/.docker/cli-plugins/docker-compose
371+
command -v docker-compose || true
372+
docker compose version
380373
docker version
381374
docker info
382375
383-
# NEW: double-check Docker before image loads (handles rare races/crashes)
384376
- name: Ensure Docker is up (Colima)
385377
run: |
386378
colima status || colima start --cpu 4 --memory 8 --disk 20
387379
for i in {1..60}; do
388-
if docker info >/dev/null 2>&1; then
389-
break
390-
fi
380+
docker info >/dev/null 2>&1 && break
391381
sleep 2
392382
done
393383
docker context inspect

0 commit comments

Comments
 (0)