diff --git a/.github/docker/layer-00.00-base-dependencies.sh b/.github/docker/layer-00.00-base-dependencies.sh index 94b0327b..7e0789e6 100755 --- a/.github/docker/layer-00.00-base-dependencies.sh +++ b/.github/docker/layer-00.00-base-dependencies.sh @@ -4,13 +4,17 @@ # shellcheck disable=SC1091 . /.github/docker/include -layer_begin "$@" +main() { + layer_begin "$@" -PACKAGES="apt-utils bash coreutils curl jq moreutils sudo tmux util-linux vim-nox" + PACKAGES="apt-utils bash coreutils curl jq moreutils sudo tmux util-linux vim-nox" -echo apt install -y "${PACKAGES}" -# shellcheck disable=SC2086 -apt install -y ${PACKAGES} || exit -printf "\n" + echo apt install -y "${PACKAGES}" + # shellcheck disable=SC2086 + apt install -y ${PACKAGES} || exit + printf "\n" -layer_end "$@" + layer_end "$@" +} + +main "${@}" 2>&1 | tee /root/layer-00.00-base-dependencies.log diff --git a/.github/docker/layer-00.10-base-daggerio.sh b/.github/docker/layer-00.10-base-daggerio.sh index cf8c89f9..2f617481 100755 --- a/.github/docker/layer-00.10-base-daggerio.sh +++ b/.github/docker/layer-00.10-base-daggerio.sh @@ -1,13 +1,19 @@ -#!/bin/sh +#!/bin/bash + +set -o pipefail # this path from for the container # shellcheck disable=SC1091 . /.github/docker/include -layer_begin "$@" +main() { + layer_begin "$@" + + echo curl -sSfL https://releases.dagger.io/dagger/install.sh \| sh + curl -sSfL https://releases.dagger.io/dagger/install.sh | sh || exit + printf "\n" -echo curl -sSfL https://releases.dagger.io/dagger/install.sh \| sh -curl -sSfL https://releases.dagger.io/dagger/install.sh | sh || exit -printf "\n" + layer_end "$@" +} -layer_end "$@" +main "${@}" |& tee /root/layer-00.10-base-daggerio.log diff --git a/.github/docker/layer-02.20-exercism-nodejs.sh b/.github/docker/layer-02.20-exercism-nodejs.sh index 56b06d32..65272efe 100755 --- a/.github/docker/layer-02.20-exercism-nodejs.sh +++ b/.github/docker/layer-02.20-exercism-nodejs.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -o pipefail + # this path from for the container # shellcheck disable=SC1091 . /.github/docker/include @@ -18,14 +20,18 @@ MODULES=( yarn ) -apt update +main() { + apt update + + echo apt install -y "${PACKAGES[@]}" + apt install -y "${PACKAGES[@]}" || exit + printf "\n" -echo apt install -y "${PACKAGES[@]}" -apt install -y "${PACKAGES[@]}" || exit -printf "\n" + echo npm install --global "${MODULES[@]}" + npm install --global "${MODULES[@]}" || exit + printf "\n" -echo npm install --global "${MODULES[@]}" -npm install --global "${MODULES[@]}" || exit -printf "\n" + layer_end "$@" +} -layer_end "$@" +main "${@}" |& tee /root/layer-02.20-exercism-nodejs.log diff --git a/.github/docker/layer-10.00-exercism-gcc_clang_llvm.sh b/.github/docker/layer-10.00-exercism-gcc_clang_llvm.sh index c93ada26..be7f8fb2 100755 --- a/.github/docker/layer-10.00-exercism-gcc_clang_llvm.sh +++ b/.github/docker/layer-10.00-exercism-gcc_clang_llvm.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -o pipefail + # https://apt.llvm.org/ # this path from for the container @@ -47,11 +49,12 @@ PACKAGES=( python3-clang-16 ) -# wget -q https://apt.llvm.org/llvm.sh -# chmod -v +x llvm.sh -# ./llvm.sh 16 all +main() { + # wget -q https://apt.llvm.org/llvm.sh + # chmod -v +x llvm.sh + # ./llvm.sh 16 all -tee -a /etc/apt/sources.list <