From dd955ebcbc28afddfd68799cf6399ea010a658dd Mon Sep 17 00:00:00 2001 From: Xaver Russ Date: Mon, 21 Jul 2025 00:34:18 +0200 Subject: [PATCH] docker file changes --- .forgejo/workflows/dockerindocker.yml | 5 +++-- containers/ansible/Dockerfile | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/dockerindocker.yml b/.forgejo/workflows/dockerindocker.yml index d90a2a0..f58ce0b 100644 --- a/.forgejo/workflows/dockerindocker.yml +++ b/.forgejo/workflows/dockerindocker.yml @@ -30,7 +30,7 @@ jobs: uses: docker/login-action@v3 with: registry: ${{ vars.REGISTRY }} - username: ${{ github.actor }} + username: ${{ secrets.CI_REGISTRY_USER }} password: ${{ secrets.FORGEJO_TOKEN }} - name: Build and Push Image for ${{ matrix.arch }} uses: docker/build-push-action@v6 @@ -51,7 +51,8 @@ jobs: - name: Wait for Docker Daemon run: | i=0 - while ! docker info >/dev/null 2>&1; do + while ! docker info >/dev/null 2>&1; + do i=$((i+1)) if [ $i -ge 15 ]; then echo "Docker did not start within 15 seconds" diff --git a/containers/ansible/Dockerfile b/containers/ansible/Dockerfile index f869f3f..2acc73f 100644 --- a/containers/ansible/Dockerfile +++ b/containers/ansible/Dockerfile @@ -1,6 +1,9 @@ -FROM alpine:edge +FROM node:current-slim -RUN apk --no-cache add openssh-client ansible nodejs npm +RUN apt-get update +RUN apt-get install -y --no-install-recommends ansible curl git +RUN curl -fsSL https://pkgs.netbird.io/install.sh | sh +RUN apt-get clean && rm -rf /var/lib/apt/lists/* WORKDIR /app