Merge pull request #5 from Frozen-Tapestry/develop

New release with permission fix

.github/pull_request_template.md

@@ -0,0 +1,3 @@
+### Base branch for this PR
+
+Please target the `develop` branch for this Pull Request.

README.md

@@ -46,13 +46,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Use Podman Build and Push Action
-        uses: frozen-tapestry/podman-build-push-action@v1
+        uses: Frozen-Tapestry/container-action@v1
         with:
           login_registry: ghcr.io
           login_username: ${{ secrets.REGISTRY_USERNAME }}
           login_password: ${{ secrets.REGISTRY_PASSWORD }}
           tags: ghcr.io/your-namespace/your-image:latest
           dockerfile: path/to/Dockerfile
+          # Use those security flags if using GitHub Action. Keep the defaults, if using Gitea.
+          security: |
+            --security-opt=seccomp=unconfined
+            --security-opt=apparmor=unconfined
           push: true
 ```
 

RELEASES.md

@@ -2,4 +2,9 @@
 
 ### v1.0.0
 
-- Initial release
+- Initial release
+
+### v1.1.0
+
+- Permission error fix
+- Readme updates

scripts/run.sh

@@ -13,12 +13,23 @@ PODMAN_USER="podman"
 chown $PODMAN_USER:$PODMAN_USER /home/$PODMAN_USER/auth
 chown $PODMAN_USER:$PODMAN_USER /home/$PODMAN_USER/.local/share/containers/storage
 
+run_cmd() {
+    local build_cmd=("$@")
+    cmd=$(printf "%q\t" "${build_cmd[@]}")
+    echo "Running: $cmd"
+    su "$PODMAN_USER" -c "$cmd"
+}
+
 ### LOGIN
 if [[ -n "$REGISTRY" && -n "$USERNAME" && -n "$PASSWORD" ]]; then
-  sudo -u $PODMAN_USER podman login \
+  build_cmd=(podman login
-    --storage-driver=overlay \
+    --storage-driver=overlay
-    --authfile="$REGISTRY_AUTH_FILE" \
+    --authfile="$REGISTRY_AUTH_FILE"
-    "$REGISTRY" -u "$USERNAME" -p "$PASSWORD"
+    "$REGISTRY"
+    -username="$USERNAME"
+    --password="$PASSWORD"
+  )
+  run_cmd "${build_cmd[@]}"
 fi
 
 generate_args() {
@@ -50,26 +61,31 @@ if [[ -n "$DOCKERFILE" ]]; then
   EXTRA_ARGS=$(generate_args "$ACTION_EXTRA_ARGS" "")
   echo "Extra args: $EXTRA_ARGS"
 
-  sudo -u $PODMAN_USER podman build --platform="linux/amd64" \
+  build_cmd=(podman build
-    --storage-driver=overlay \
+    --platform="linux/amd64"
-    --authfile="$REGISTRY_AUTH_FILE" \
+    --storage-driver=overlay
-    --pull=true \
+    --authfile="$REGISTRY_AUTH_FILE"
-    --label image.created="$CREATED" \
+    --pull=true
-    --label image.revision="$REVISION" \
+    --label=image.created="$CREATED"
-    --label image.source="$SOURCE" \
+    --label=image.revision="$REVISION"
-    $TAGS \
+    --label=image.source="$SOURCE"
-    $LABELS \
+    $TAGS
-    $BUILD_ARGS \
+    $LABELS
-    $EXTRA_ARGS \
+    $BUILD_ARGS
-    -f "$DOCKERFILE" \
+    $EXTRA_ARGS
+    --file="$DOCKERFILE"
     .
+  )
+  run_cmd "${build_cmd[@]}"
 fi
 
 if [[ -n "$PUSH" && "$PUSH" == "true" ]]; then
   TAGS=$(generate_args "$ACTION_TAGS" "")
   echo "Tags: $TAGS"
 
-  sudo -u $PODMAN_USER podman push \
+  build_cmd=(podman push
-    --storage-driver=overlay \
+    --storage-driver=overlay
     --authfile="$REGISTRY_AUTH_FILE" $TAGS
+  )
+  run_cmd "${build_cmd[@]}"
 fi