Author:
Hash:
Timestamp:
+4 -4 +/-3 browse
Kevin Schoon [me@kevinschoon.com]
b329d74078fac9c35a7eec7a8e0b3861a785706e
Fri, 23 May 2025 21:17:39 +0000 (5 months ago)
| 1 | diff --git a/containers/woodpecker/Containerfile b/containers/woodpecker/Containerfile |
| 2 | index 8cdaef6..4bcaf42 100644 |
| 3 | --- a/containers/woodpecker/Containerfile |
| 4 | +++ b/containers/woodpecker/Containerfile |
| 5 | @@ -4,7 +4,7 @@ FROM $CI_BASE_IMAGE |
| 6 | USER root |
| 7 | |
| 8 | RUN apk add --no-cache \ |
| 9 | - curl cargo rust rust-clippy rustfmt pkgconf sqlite sassc ncurses npm \ |
| 10 | + curl cargo rust rust-clippy rustfmt pkgconf sqlite ncurses npm \ |
| 11 | openssl openssl-dev fontconfig fontconfig-dev \ |
| 12 | tree-sitter-dev build-base git git-lfs fuse-overlayfs podman |
| 13 | |
| 14 | diff --git a/scripts/build_container.sh b/scripts/build_container.sh |
| 15 | index e7a3870..9202265 100755 |
| 16 | --- a/scripts/build_container.sh |
| 17 | +++ b/scripts/build_container.sh |
| 18 | @@ -7,7 +7,7 @@ set -e |
| 19 | # The version of Alpine used to build all containers and the runtime |
| 20 | # version used. Ayllu tracks the latest Rust version in stable Alpine. |
| 21 | ALPINE_BASE_IMAGE="${ALPINE_BASE_IMAGE:-alpine:3.21}" |
| 22 | - CI_BASE_IMAGE="${CI_BASE_IMAGE:-docker.io/woodpeckerci/woodpecker-agent:v3.3.0-alpine}" |
| 23 | + CI_BASE_IMAGE="${CI_BASE_IMAGE:-docker.io/woodpeckerci/woodpecker-agent:v3.6.0-alpine}" |
| 24 | |
| 25 | REGISTRY="registry.ayllu-forge.org" |
| 26 | IMAGE_PATH="ayllu/ayllu" |
| 27 | diff --git a/scripts/push_container.sh b/scripts/push_container.sh |
| 28 | index fea911c..6c42a00 100755 |
| 29 | --- a/scripts/push_container.sh |
| 30 | +++ b/scripts/push_container.sh |
| 31 | @@ -6,7 +6,7 @@ |
| 32 | # |
| 33 | # Assumes that the image you are pushing has already been built via the |
| 34 | # build_container.sh script. |
| 35 | - set -e |
| 36 | + set -ex |
| 37 | |
| 38 | REGISTRY="registry.ayllu-forge.org" |
| 39 | REGISTRY_AUTH="registry-auth.ayllu-forge.org" |
| 40 | @@ -31,7 +31,7 @@ if [ "$NAME" = "ayllu" ] ; then |
| 41 | podman tag "$REGISTRY/$IMAGE_PATH:$BRANCH_NAME" "$REGISTRY_AUTH/$IMAGE_PATH:$BRANCH_NAME" |
| 42 | podman push "$REGISTRY_AUTH/$IMAGE_PATH:$BRANCH_NAME" |
| 43 | else |
| 44 | - podman tag "$REGISTRY/$IMAGE_PATH:$COMMIT_ID" "$REGISTRY_AUTH/$IMAGE_PATH:$NAME-$COMMIT_ID" |
| 45 | + podman tag "$REGISTRY/$IMAGE_PATH:$NAME-$COMMIT_ID" "$REGISTRY_AUTH/$IMAGE_PATH:$NAME-$COMMIT_ID" |
| 46 | podman push "$REGISTRY_AUTH/$IMAGE_PATH:$NAME-$COMMIT_ID" |
| 47 | podman tag "$REGISTRY/$IMAGE_PATH:$NAME-$BRANCH_NAME" "$REGISTRY_AUTH/$IMAGE_PATH:$NAME-$BRANCH_NAME" |
| 48 | podman push "$REGISTRY_AUTH/$IMAGE_PATH:$NAME-$BRANCH_NAME" |