From c1a7cf08523b7d3fcc69edeb4bee00e0488926b4 Mon Sep 17 00:00:00 2001 From: docker-images Date: Wed, 30 Jul 2025 23:41:10 +0200 Subject: [PATCH] Update .forgejo/workflows/build.yml --- .forgejo/workflows/build.yml | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml index 53a951c..e171ae6 100644 --- a/.forgejo/workflows/build.yml +++ b/.forgejo/workflows/build.yml @@ -1,4 +1,4 @@ -name: Auto Build caddy-shork Docker Container +name: Auto Build caddy-shork podman Container enable-email-notifications: true on: @@ -8,11 +8,11 @@ on: jobs: build: - runs-on: dind + runs-on: pinp env: PACKAGE: caddy-shork - DOCKER_REGISTRY: git.shork.ch + PODMAN_REGISTRY: git.shork.ch REGISTRY_USER: docker-images CADDY_APPS: | github.com/caddy-dns/porkbun @@ -29,22 +29,12 @@ jobs: - uses: actions/checkout@v3 - - 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 + - name: Build and push 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" 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 + sed -i "s|\#\$XCADDY_APPS|$escaped_cmd|g" podmanfile + 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