From 462d1582116ae841223c87214779ed35fb263ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Rudowicz?= <michal.rudowicz@fl9.eu>
Date: Sun, 23 Feb 2025 17:14:38 +0100
Subject: [PATCH] try out buildah, maybe it'll work out better

---
 .forgejo/workflows/build-jekyll.yml | 16 ++++------------
 docker/build.Dockerfile             |  2 +-
 docker/serve.Dockerfile             |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.forgejo/workflows/build-jekyll.yml b/.forgejo/workflows/build-jekyll.yml
index 22090dd..01c10a8 100644
--- a/.forgejo/workflows/build-jekyll.yml
+++ b/.forgejo/workflows/build-jekyll.yml
@@ -9,7 +9,6 @@ jobs:
       image: git.hswro.org/fleg/hswro_org_build:latest
     steps:
       - uses: actions/checkout@v3
-        with:
       - run: bundle exec jekyll build
       - uses: actions/upload-artifact@v3
         with:
@@ -18,16 +17,9 @@ jobs:
   build_and_push_container:
     runs-on: docker
     container:
-      image: ubuntu-latest
+      image: git.hswro.org/fleg/hswro_org_build:latest
     steps:
       - uses: actions/checkout@v3
-      - 
-        name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: git.hswro.org
-          username: ${{ github.actor }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - 
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - uses: actions/download-artifact@v3
+      - run: cd .. && find
+      - run: cd generated-site && buildah build --file ../docker/serve.Dockerfile -t hswro-org:latest
diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile
index 17431db..61adc1a 100644
--- a/docker/build.Dockerfile
+++ b/docker/build.Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:22.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ruby-full build-essential zlib1g-dev \
     build-essential \
-    git nodejs git podman \
+    git nodejs git buildah \
     && rm -rf /var/lib/apt/lists/* \
  && gem install --no-document jekyll -v 4.4.1 \
  && gem install --no-document jekyll-environment-variables \
diff --git a/docker/serve.Dockerfile b/docker/serve.Dockerfile
index 7c4c412..c24ee9c 100644
--- a/docker/serve.Dockerfile
+++ b/docker/serve.Dockerfile
@@ -1,4 +1,4 @@
-FROM busybox:1.35
+FROM busybox:stable
 
 # Create a non-root user to own the files and run our server
 RUN adduser -D static