Merge pull request #4 from Frozen-Tapestry/fix/clone-err2

Permission fix & readme update
This commit is contained in:
Foat 2025-02-28 16:40:07 +03:00 committed by GitHub
commit 25cafbfcad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 47 additions and 19 deletions

3
.github/pull_request_template.md vendored Normal file
View file

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

View file

@ -53,6 +53,10 @@ jobs:
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
```

View file

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

View file

@ -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 \
--storage-driver=overlay \
--authfile="$REGISTRY_AUTH_FILE" \
"$REGISTRY" -u "$USERNAME" -p "$PASSWORD"
build_cmd=(podman login
--storage-driver=overlay
--authfile="$REGISTRY_AUTH_FILE"
"$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" \
--storage-driver=overlay \
--authfile="$REGISTRY_AUTH_FILE" \
--pull=true \
--label image.created="$CREATED" \
--label image.revision="$REVISION" \
--label image.source="$SOURCE" \
$TAGS \
$LABELS \
$BUILD_ARGS \
$EXTRA_ARGS \
-f "$DOCKERFILE" \
build_cmd=(podman build
--platform="linux/amd64"
--storage-driver=overlay
--authfile="$REGISTRY_AUTH_FILE"
--pull=true
--label=image.created="$CREATED"
--label=image.revision="$REVISION"
--label=image.source="$SOURCE"
$TAGS
$LABELS
$BUILD_ARGS
$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 \
--storage-driver=overlay \
build_cmd=(podman push
--storage-driver=overlay
--authfile="$REGISTRY_AUTH_FILE" $TAGS
)
run_cmd "${build_cmd[@]}"
fi