From 31fc6c2208c3dafca6bab6bfd5fda5f783eb0a0a Mon Sep 17 00:00:00 2001
From: Paul Pan <i@0x7f.app>
Date: Mon, 19 Feb 2024 17:07:06 +0800
Subject: [PATCH] fix: GitHub Actions: use podman instead

---
 .github/workflows/{docker.yml => container.yml} | 10 +++++-----
 Runner.Dockerfile                               |  6 +++---
 Server.Dockerfile                               |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename .github/workflows/{docker.yml => container.yml} (83%)

diff --git a/.github/workflows/docker.yml b/.github/workflows/container.yml
similarity index 83%
rename from .github/workflows/docker.yml
rename to .github/workflows/container.yml
index d4be074..4b6cc4b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/container.yml
@@ -1,4 +1,4 @@
-name: Build Docker Image
+name: Build Container Image
 on: [ push ]
 jobs:
   image:
@@ -6,7 +6,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Login to Container Registry
-        uses: docker/login-action@v3
+        uses: redhat-actions/podman-login@v1
         with:
           registry: git.0x7f.app
           username: ${{ secrets.CONTAINER_USERNAME }}
@@ -19,12 +19,12 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: ./build_image.sh base
         env:
-          DOCKER: docker
+          DOCKER: podman
       - name: Build Server Image
         run: ./build_image.sh server
         env:
-          DOCKER: docker
+          DOCKER: podman
       - name: Build Runner Image
         run: ./build_image.sh runner
         env:
-          DOCKER: docker
+          DOCKER: podman
diff --git a/Runner.Dockerfile b/Runner.Dockerfile
index 75d52ea..43bdeee 100644
--- a/Runner.Dockerfile
+++ b/Runner.Dockerfile
@@ -6,7 +6,7 @@ ENV CGO_ENABLED=0
 WORKDIR /builder
 
 RUN apk add --no-cache git make
-RUN --mount=type=cache,id=golang,target=/go/pkg go install github.com/swaggo/swag/cmd/swag@latest
+RUN go install github.com/swaggo/swag/cmd/swag@latest
 
 ARG IMAGE_PREFIX=git.0x7f.app/woj
 ENV CONTAINER_IMAGE_FULL=${IMAGE_PREFIX}/ubuntu-full:latest
@@ -14,10 +14,10 @@ ENV CONTAINER_IMAGE_RUN=${IMAGE_PREFIX}/ubuntu-run:latest
 
 COPY go.mod /builder/go.mod
 COPY go.sum /builder/go.sum
-RUN --mount=type=cache,id=golang,target=/go/pkg go mod download
+RUN go mod download
 
 COPY . /builder
-RUN --mount=type=cache,id=golang,target=/go/pkg make build
+RUN make build
 
 
 # main image
diff --git a/Server.Dockerfile b/Server.Dockerfile
index 260feec..4884884 100644
--- a/Server.Dockerfile
+++ b/Server.Dockerfile
@@ -6,14 +6,14 @@ ENV CGO_ENABLED=0
 WORKDIR /builder
 
 RUN apk add --no-cache git make
-RUN --mount=type=cache,id=golang,target=/go/pkg go install github.com/swaggo/swag/cmd/swag@latest
+RUN go install github.com/swaggo/swag/cmd/swag@latest
 
 COPY go.mod /builder/go.mod
 COPY go.sum /builder/go.sum
-RUN --mount=type=cache,id=golang,target=/go/pkg go mod download
+RUN go mod download
 
 COPY . /builder
-RUN --mount=type=cache,id=golang,target=/go/pkg make build
+RUN make build
 
 # UI Builder
 FROM git.0x7f.app/woj/woj-ui:1.1.0 AS ui-builder