From 1bfd7a2dd5292f12d8089667b78653cafd4f0790 Mon Sep 17 00:00:00 2001
From: tahahawa <tahahawa@gmail.com>
Date: Wed, 18 Jun 2025 10:13:52 -0400
Subject: [PATCH] It worked with --privileged with rootful docker, try podman
 with rootless

---
 .gitea/workflows/harmony_composer.yaml | 28 +++++++++++---------------
 Dockerfile                             |  4 ++--
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/harmony_composer.yaml b/.gitea/workflows/harmony_composer.yaml
index bcab197..bc683a0 100644
--- a/.gitea/workflows/harmony_composer.yaml
+++ b/.gitea/workflows/harmony_composer.yaml
@@ -9,30 +9,26 @@ jobs:
   package_harmony_composer:
     container:
       image: hub.nationtech.io/harmony/harmony_composer:latest@sha256:42884e0cea2063e0ce15d61b3edc64c2bc2069e845a4df8bd6529bc27e36e005
-      options: --privileged
     runs-on: Taha-Linux
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Build for Linux x86_64
-        run: cargo build --release --bin harmony_composer --target x86_64-unknown-linux-gnu
+      # - name: Build for Linux x86_64
+      #   run: cargo build --release --bin harmony_composer --target x86_64-unknown-linux-gnu
 
       # - name: Build for Linux ARM64
       #   run: cargo build --release --bin harmony_composer --target aarch64-unknown-linux-gnu
 
-      - name: Build for Windows x86_64 GNU
-        run: cargo build --release --bin harmony_composer --target x86_64-pc-windows-gnu
+      # - name: Build for Windows x86_64 GNU
+      #   run: cargo build --release --bin harmony_composer --target x86_64-pc-windows-gnu
 
-      # - name: Build for MacOS ARM64
-      #   run: cargo build --release --bin harmony_composer --target aarch64-apple-darwin
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: |
-            target/x86_64-unknown-linux-gnu/release/harmony_composer
-            target/x86_64-pc-windows-gnu/release/harmony_composer.exe
+      # - uses: actions/upload-artifact@v3
+      #   with:
+      #     name: binaries
+      #     path: |
+      #       target/x86_64-unknown-linux-gnu/release/harmony_composer
+      #       target/x86_64-pc-windows-gnu/release/harmony_composer.exe
 
       - name: Setup log into hub.nationtech.io
         uses: docker/login-action@v3
@@ -43,10 +39,10 @@ jobs:
 
       # TODO: build ARM images too
       - name: Build docker container
-        run: docker build . -t hub.nationtech.io/harmony/harmony_composer
+        run: docker build . -t hub.nationtech.io/harmony/harmony_composer:latest
 
       - name: Push docker container
-        run: docker push hub.nationtech.io/harmony/harmony_composer
+        run: docker push -a hub.nationtech.io/harmony/harmony_composer
 
       # - name: Set up Docker Buildx
       #   uses: docker/setup-buildx-action@v3
diff --git a/Dockerfile b/Dockerfile
index e785a2c..2798cb6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,8 +15,8 @@ RUN apt update
 # For checkout action
 RUN apt install -y nodejs
 
-RUN apt install -y docker.io
-# RUN apt install -y podman podman-docker
+# RUN apt install -y docker.io
+RUN apt install -y podman podman-docker
 
 RUN rustup target add x86_64-unknown-linux-gnu