diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 0c2818f..53a951c 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -1,4 +1,4 @@ -name: Auto Build caddy-shork podman Container +name: Auto Build caddy-shork Docker Container enable-email-notifications: true on: @@ -8,11 +8,11 @@ on: jobs: build: - runs-on: pinp + runs-on: dind env: PACKAGE: caddy-shork - PODMAN_REGISTRY: git.shork.ch + DOCKER_REGISTRY: git.shork.ch REGISTRY_USER: docker-images CADDY_APPS: | github.com/caddy-dns/porkbun @@ -22,19 +22,29 @@ jobs: github.com/abiosoft/caddy-exec steps: -# - name: Install dependencies -# shell: sh -# run: | -# apk add --no-cache git nodejs npm bash sed curl jq podman + - name: Install dependencies + shell: sh + run: | + apk add --no-cache git nodejs npm bash sed curl jq - uses: actions/checkout@v3 - - name: Build and push image + - name: Start Docker daemon + run: | + dockerd-entrypoint.sh & + for i in {1..10}; do + docker info && break + echo "Waiting for Docker daemon..." + sleep 3 + done + docker info || { echo "Docker daemon failed to start."; exit 1; } + + - name: Build and push Docker image run: | xcaddy_cmd="" for app in $CADDY_APPS; do xcaddy_cmd+=" --with $app"; done escaped_cmd=$(printf '%s\n' "$xcaddy_cmd" | sed 's/[\/&]/\\&/g') - sed -i "s|\#\$XCADDY_APPS|$escaped_cmd|g" Containerfile - podman build --build-arg NPROC=1 -t $PODMAN_REGISTRY/$REGISTRY_USER/$PACKAGE:latest . - echo "${{ secrets.podman_PASSWORD }}" | podman login $PODMAN_REGISTRY -u $REGISTRY_USER --password-stdin - podman push --all-tags $PODMAN_REGISTRY/$REGISTRY_USER/$PACKAGE + sed -i "s|\#\$XCADDY_APPS|$escaped_cmd|g" Dockerfile + docker build --build-arg NPROC=1 -t $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE:latest . + echo "${{ secrets.DOCKER_PASSWORD }}" | docker login $DOCKER_REGISTRY -u $REGISTRY_USER --password-stdin + docker push --all-tags $DOCKER_REGISTRY/$REGISTRY_USER/$PACKAGE