Merge pull request 'fix: mergeblock missing container block' (#15) from dev-v0.7.x into main
Some checks failed
Build and Publish Docker Image (Semantic Cache) / build (linux/amd64, docker-amd64) (push) Successful in 1m59s
Build and Publish Docker Image / build (linux/amd64, docker-amd64) (push) Failing after 58s
Build and Publish Docker Image (Semantic Cache) / build (linux/arm64, docker-arm64) (push) Successful in 13m19s
Build and Publish Docker Image (Semantic Cache) / merge (push) Successful in 32s
Build and Publish Docker Image / build (linux/arm64, docker-arm64) (push) Successful in 12m11s
Build and Publish Docker Image / merge (push) Has been skipped

Reviewed-on: https://bitfreedom.net/code/code/nomyo-ai/nomyo-router/pulls/15
This commit is contained in:
Alpha Nerd 2026-04-05 09:54:41 +02:00
commit d78c85dc48
2 changed files with 32 additions and 2 deletions

View file

@ -90,6 +90,9 @@ jobs:
merge:
runs-on: docker-amd64
needs: build
container:
image: node:lts-bookworm
options: --privileged
permissions:
contents: read
packages: write
@ -97,7 +100,19 @@ jobs:
- name: Install Docker
run: |
apt-get update -qq
apt-get install -y -qq docker.io
apt-get install -y -qq docker.io jq
- name: Start Docker daemon
run: |
dockerd --host=unix:///var/run/docker.sock --iptables=false --dns=8.8.8.8 --dns=8.8.4.4 > /tmp/dockerd.log 2>&1 &
for i in $(seq 1 30); do
sleep 2
docker info > /dev/null 2>&1 && echo "Docker daemon ready" && exit 0
echo "Waiting for Docker daemon... ($i/30)"
done
echo "=== dockerd failed to start, logs: ==="
cat /tmp/dockerd.log
exit 1
- name: Set up Docker Buildx
uses: https://github.com/docker/setup-buildx-action@v3

View file

@ -81,6 +81,9 @@ jobs:
merge:
runs-on: docker-amd64
needs: build
container:
image: node:lts-bookworm
options: --privileged
permissions:
contents: read
packages: write
@ -88,7 +91,19 @@ jobs:
- name: Install Docker
run: |
apt-get update -qq
apt-get install -y -qq docker.io
apt-get install -y -qq docker.io jq
- name: Start Docker daemon
run: |
dockerd --host=unix:///var/run/docker.sock --iptables=false --dns=8.8.8.8 --dns=8.8.4.4 > /tmp/dockerd.log 2>&1 &
for i in $(seq 1 30); do
sleep 2
docker info > /dev/null 2>&1 && echo "Docker daemon ready" && exit 0
echo "Waiting for Docker daemon... ($i/30)"
done
echo "=== dockerd failed to start, logs: ==="
cat /tmp/dockerd.log
exit 1
- name: Set up Docker Buildx
uses: https://github.com/docker/setup-buildx-action@v3