From 7bdc80cc58b94ab9139bb61c086badb03c0c5536 Mon Sep 17 00:00:00 2001
From: Victor Payno <vpayno@users.noreply.github.com>
Date: Wed, 30 Aug 2023 20:06:42 -0700
Subject: [PATCH] ci(docker-build): update/clean up layer scripts

---
 .../docker/layer-00.00-base-dependencies.sh   |  3 +
 .github/docker/layer-00.10-base-daggerio.sh   |  3 +
 .github/docker/layer-02.20-exercism-nodejs.sh | 27 +++---
 .../layer-10.00-exercism-gcc_clang_llvm.sh    | 83 +++++++++---------
 .github/docker/layer-15.00-exercism-rust.sh   | 87 ++++++++++---------
 5 files changed, 109 insertions(+), 94 deletions(-)

diff --git a/.github/docker/layer-00.00-base-dependencies.sh b/.github/docker/layer-00.00-base-dependencies.sh
index 7e0789e6..5850014f 100755
--- a/.github/docker/layer-00.00-base-dependencies.sh
+++ b/.github/docker/layer-00.00-base-dependencies.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+#
+# .github/docker/layer-00.00-base-dependencies.sh
+#
 
 # this path from for the container
 # shellcheck disable=SC1091
diff --git a/.github/docker/layer-00.10-base-daggerio.sh b/.github/docker/layer-00.10-base-daggerio.sh
index 2f617481..b1733952 100755
--- a/.github/docker/layer-00.10-base-daggerio.sh
+++ b/.github/docker/layer-00.10-base-daggerio.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# .github/docker/layer-00.10-base-daggerio.sh
+#
 
 set -o pipefail
 
diff --git a/.github/docker/layer-02.20-exercism-nodejs.sh b/.github/docker/layer-02.20-exercism-nodejs.sh
index 65272efe..f12db9fd 100755
--- a/.github/docker/layer-02.20-exercism-nodejs.sh
+++ b/.github/docker/layer-02.20-exercism-nodejs.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# .github/docker/layer-02.20-exercism-nodejs.sh
+#
 
 set -o pipefail
 
@@ -6,21 +9,21 @@ set -o pipefail
 # shellcheck disable=SC1091
 . /.github/docker/include
 
-layer_begin "$@"
+main() {
+	layer_begin "$@"
 
-declare -a PACKAGES
-PACKAGES=(
-	nodejs
-	npm
-)
+	declare -a PACKAGES
+	PACKAGES=(
+		nodejs
+		npm
+	)
 
-declare -a MODULES
-MODULES=(
-	json2yaml
-	yarn
-)
+	declare -a MODULES
+	MODULES=(
+		json2yaml
+		yarn
+	)
 
-main() {
 	apt update
 
 	echo apt install -y "${PACKAGES[@]}"
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 be7f8fb2..24fb13b8 100755
--- a/.github/docker/layer-10.00-exercism-gcc_clang_llvm.sh
+++ b/.github/docker/layer-10.00-exercism-gcc_clang_llvm.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# .github/docker/layer-10.00-exercism-gcc_clang_llvm.sh
+#
 
 set -o pipefail
 
@@ -8,48 +11,48 @@ set -o pipefail
 # shellcheck disable=SC1091
 . /.github/docker/include
 
-layer_begin "$@"
+main() {
+	layer_begin "$@"
 
-declare -a PACKAGES
-PACKAGES=(
-	build-essential
-	ccls
-	clangd-16
-	clang-16
-	clang-16-doc
-	clang-format-16
-	clang-tidy-16
-	clang-tools-16
-	cmake
-	gcc
-	gcovr
-	gettext
-	gnu-standards
-	g++
-	lcov
-	libboost-all-dev
-	libclang1-16
-	libclang-16-dev
-	libclang-common-16-dev
-	libclang-rt-16-dev
-	libc++abi-16-dev
-	libc++-16-dev
-	libfuzzer-16-dev
-	libllvm16
-	libllvm-16-ocaml-dev
-	libssl-dev
-	libunwind-16-dev
-	lldb-16
-	lld-16
-	llvm-16
-	llvm-16-dev
-	llvm-16-runtime
-	make
-	pkg-config
-	python3-clang-16
-)
+	declare -a PACKAGES
+	PACKAGES=(
+		build-essential
+		ccls
+		clangd-16
+		clang-16
+		clang-16-doc
+		clang-format-16
+		clang-tidy-16
+		clang-tools-16
+		cmake
+		gcc
+		gcovr
+		gettext
+		gnu-standards
+		g++
+		lcov
+		libboost-all-dev
+		libclang1-16
+		libclang-16-dev
+		libclang-common-16-dev
+		libclang-rt-16-dev
+		libc++abi-16-dev
+		libc++-16-dev
+		libfuzzer-16-dev
+		libllvm16
+		libllvm-16-ocaml-dev
+		libssl-dev
+		libunwind-16-dev
+		lldb-16
+		lld-16
+		llvm-16
+		llvm-16-dev
+		llvm-16-runtime
+		make
+		pkg-config
+		python3-clang-16
+	)
 
-main() {
 	# wget -q https://apt.llvm.org/llvm.sh
 	# chmod -v +x llvm.sh
 	# ./llvm.sh 16 all
diff --git a/.github/docker/layer-15.00-exercism-rust.sh b/.github/docker/layer-15.00-exercism-rust.sh
index f494b89a..54e65917 100755
--- a/.github/docker/layer-15.00-exercism-rust.sh
+++ b/.github/docker/layer-15.00-exercism-rust.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+#
+# .github/docker/layer-15.00-exercism-rust.sh
+#
 
 set -o pipefail
 
@@ -8,49 +11,49 @@ set -o pipefail
 # shellcheck disable=SC1091
 . /.github/docker/include
 
-layer_begin "$@"
-
-declare -a PACKAGES
-PACKAGES=(
-	clang-16
-	clang-tidy-16
-	clang-tools-16
-	cmake
-	g++
-	gcovr
-	lcov
-	libllvm-16-ocaml-dev
-	libllvm16
-	libssl-dev
-	lld-16
-	llvm-16
-	llvm-16-dev
-	llvm-16-doc
-	llvm-16-examples
-	llvm-16-runtime
-)
-
-declare -a CRATES
-CRATES=(
-	cargo-audit
-	cargo-edit
-	cargo-fix
-	cargo-fuzz
-	cargo-kcov
-	cargo-llvm-cov
-	cargo-tarpaulin
-	grcov
-	zellij
-)
-
-declare -a COMPONENTS
-COMPONENTS=(
-	clippy
-	llvm-tools-x86_64-unknown-linux-gnu
-	rustfmt
-)
-
 main() {
+	layer_begin "$@"
+
+	declare -a PACKAGES
+	PACKAGES=(
+		clang-16
+		clang-tidy-16
+		clang-tools-16
+		cmake
+		g++
+		gcovr
+		lcov
+		libllvm-16-ocaml-dev
+		libllvm16
+		libssl-dev
+		lld-16
+		llvm-16
+		llvm-16-dev
+		llvm-16-doc
+		llvm-16-examples
+		llvm-16-runtime
+	)
+
+	declare -a CRATES
+	CRATES=(
+		cargo-audit
+		cargo-edit
+		cargo-fix
+		cargo-fuzz
+		cargo-kcov
+		cargo-llvm-cov
+		cargo-tarpaulin
+		grcov
+		zellij
+	)
+
+	declare -a COMPONENTS
+	COMPONENTS=(
+		clippy
+		llvm-tools-x86_64-unknown-linux-gnu
+		rustfmt
+	)
+
 	echo Running: apt install -y "${PACKAGES[@]}"
 	time apt install -y "${PACKAGES[@]}" || exit
 	printf "\n"