diff --git a/builder.sh b/builder.sh index 4652d43..9c0cea0 100755 --- a/builder.sh +++ b/builder.sh @@ -1,13 +1,12 @@ #!/usr/bin/env bash -set -x +set -xe YQ_VERSION=v4.44.2 -NODE_VERSION=22.15.1 -PNPM_VERSION=v9.5.0 NODE_VERSION=22.x +PNPM_VERSION=v9.5.0 ctr=$(buildah from "docker.io/library/debian:trixie-20250428") -mnt=$(buildah mount $ctr) +#mnt=$(buildah mount $ctr) buildah run $ctr -- apt-get update buildah run $ctr -- apt-get install -y --no-install-recommends \ @@ -23,19 +22,19 @@ buildah run $ctr -- apt-get install -y --no-install-recommends \ ; #gpg \ -sed $mnt/usr/share/containers/storage.conf \ - -e '/^#\?mount_program/c\ -mount_program = "/usr/bin/fuse-overlayfs"' \ -> $mnt/etc/containers/storage.conf +buildah run $ctr -- sh -c "sed /usr/share/containers/storage.conf \ + -e '/^#\?mount_program/c"'\ +'"mount_program = \"/usr/bin/fuse-overlayfs\"' \ +> /etc/containers/storage.conf" # yq https://github.com/mikefarah/yq?tab=readme-ov-file#install -buildah run $ctr -- sh -c 'curl --silent --location "https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_linux_amd64.tar.gz" \ +buildah run $ctr -- sh -c "curl --silent --location \"https://github.com/mikefarah/yq/releases/download/$YQ_VERSION/yq_linux_amd64.tar.gz\" \ | tar --extract --gzip --to-stdout ./yq_linux_amd64 \ - | install --owner=root --group=root --mode=0755 /dev/stdin $mnt/usr/local/bin/yq \ -;' + | install --owner=root --group=root --mode=0755 /dev/stdin /usr/local/bin/yq \ +;" # node https://github.com/nodesource/distributions?tab=readme-ov-file#using-debian-as-root-nodejs-22 -buildah run $ctr -- sh -c 'curl --silent --location "https://deb.nodesource.com/setup_$NODE_VERSION" | bash' +buildah run $ctr -- sh -c "curl --silent --location \"https://deb.nodesource.com/setup_$NODE_VERSION\" | bash" buildah run $ctr -- apt-get install -y --no-install-recommends nodejs # pnpm https://nodejs.org/api/corepack.html#upgrading-the-global-versions buildah run $ctr -- corepack install --global pnpm@$PNPM_VERSION