revert to podman
This commit is contained in:
parent
dfa39244c7
commit
74ac786fcb
2 changed files with 5 additions and 6 deletions
|
@ -57,7 +57,7 @@ runs:
|
||||||
- name: Run container steps
|
- name: Run container steps
|
||||||
uses: frozen-tapestry/docker-run-action@v5p
|
uses: frozen-tapestry/docker-run-action@v5p
|
||||||
with:
|
with:
|
||||||
image: quay.io/buildah/stable:latest
|
image: quay.io/podman/stable:latest
|
||||||
mount_ws: true
|
mount_ws: true
|
||||||
options: |
|
options: |
|
||||||
${{ inputs.security }}
|
${{ inputs.security }}
|
||||||
|
|
|
@ -10,7 +10,7 @@ PUSH=${PUSH:-}
|
||||||
|
|
||||||
### LOGIN
|
### LOGIN
|
||||||
if [[ -n "$REGISTRY" && -n "$USERNAME" && -n "$PASSWORD" ]]; then
|
if [[ -n "$REGISTRY" && -n "$USERNAME" && -n "$PASSWORD" ]]; then
|
||||||
buildah login --storage-driver=overlay2 "$REGISTRY" -u "$USERNAME" -p "$PASSWORD"
|
podman login --storage-driver=overlay "$REGISTRY" -u "$USERNAME" -p "$PASSWORD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
generate_args() {
|
generate_args() {
|
||||||
|
@ -42,9 +42,8 @@ if [[ -n "$DOCKERFILE" ]]; then
|
||||||
EXTRA_ARGS=$(generate_args "$ACTION_EXTRA_ARGS" "")
|
EXTRA_ARGS=$(generate_args "$ACTION_EXTRA_ARGS" "")
|
||||||
echo "Extra args: $EXTRA_ARGS"
|
echo "Extra args: $EXTRA_ARGS"
|
||||||
|
|
||||||
buildah bud --platform="linux/amd64" \
|
podman build --platform="linux/amd64" \
|
||||||
--storage-driver=overlay2 \
|
--storage-driver=overlay \
|
||||||
--layers \
|
|
||||||
--pull=true \
|
--pull=true \
|
||||||
--label image.created="$CREATED" \
|
--label image.created="$CREATED" \
|
||||||
--label image.revision="$REVISION" \
|
--label image.revision="$REVISION" \
|
||||||
|
@ -61,5 +60,5 @@ if [[ -n "$PUSH" && "$PUSH" == "true" ]]; then
|
||||||
TAGS=$(generate_args "$ACTION_TAGS" "")
|
TAGS=$(generate_args "$ACTION_TAGS" "")
|
||||||
echo "Tags: $TAGS"
|
echo "Tags: $TAGS"
|
||||||
|
|
||||||
buildah push --storage-driver=overlay2 $TAGS
|
podman push --storage-driver=overlay $TAGS
|
||||||
fi
|
fi
|
Loading…
Add table
Add a link
Reference in a new issue