diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ba7236d..cf1202d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,4 +10,4 @@ jobs: with: fetch-depth: 0 - name: Run commitsar - uses: docker://aevea/commitsar@sha256:8d2db4e430dd06e3fcde173add43dada80b37150ba1191a69cda1c0bcdba9cb1 + uses: docker://aevea/commitsar@sha256:e4aed72de9a00b990a53c678ad51fbe9bd04e127a617d10beab0ef0204b1dfa0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1a0ff39..4dbe99b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: fetch-depth: 0 - name: Release Notary Action - uses: docker://aevea/release-notary@sha256:b77e86ce9ce4b0c8774cdb3b807b756d1d6139d73aca74388560250de259be4e + uses: docker://aevea/release-notary@sha256:690915bf87458fd8eb1e1ff0be34b33377f920eda3f38b96c62ecbf897c831f4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/Dockerfile b/Dockerfile index 8e0f846..2c0fd25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine as certs RUN apk --update add ca-certificates -FROM gcr.io/kaniko-project/executor:v1.20.0-debug +FROM gcr.io/kaniko-project/executor:v1.23.2-debug SHELL ["/busybox/sh", "-c"] diff --git a/README.md b/README.md index 30f8528..56d6940 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # Kaniko image builder +> [!WARNING] +> The kaniko project no longer seems to [have maintainers](https://github.com/GoogleContainerTools/kaniko/issues/3348). Keep this in mind before deciding to use kaniko as your image builder. + This Action uses the [kaniko](https://github.com/GoogleContainerTools/kaniko) executor instead of the docker daemon. Kaniko builds the image by extracting the filesystem of the base image, making the changes in the user space, snapshotting any change and appending it to the base image filesystem. diff --git a/entrypoint.sh b/entrypoint.sh index e5394e7..8a29b69 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -94,13 +94,17 @@ EOF # https://github.com/GoogleContainerTools/kaniko/issues/1803 # https://github.com/GoogleContainerTools/kaniko/issues/1349 export IFS='' +# Removes a trailing new line +ARGS=$(echo "${ARGS}" | sed 's/\n*$//') kaniko_cmd="/kaniko/executor ${ARGS} --reproducible --force" echo "Running kaniko command ${kaniko_cmd}" eval "${kaniko_cmd}" echo "image=$IMAGE" >> "$GITHUB_OUTPUT" echo "digest=$(cat /kaniko/digest)" >> "$GITHUB_OUTPUT" -echo "image-tag-digest=$(cat /kaniko/image-tag-digest)" >> "$GITHUB_OUTPUT" +echo "image-tag-digest<>"$GITHUB_OUTPUT" +echo "$(cat /kaniko/image-tag-digest)" >>"$GITHUB_OUTPUT" +echo 'EOF' >>"$GITHUB_OUTPUT" if [ -n "$INPUT_SKIP_UNCHANGED_DIGEST" ]; then