Disable debug logging and add manual logging elastic stack startup scripts

Author: triarius

packer/linux/conf/bin/bk-configure-docker.sh

@@ -1,52 +1,88 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2094
-set -euxo pipefail
 
-## Configures docker before system starts
+set -Eeuo pipefail
+
+on_error() {
+  local exit_code="$?"
+  local error_line="$1"
+
+  echo "${BASH_SOURCE[0]} errored with exit code ${exit_code} on line ${error_line}."
+  exit "$exit_code"
+}
+
+trap 'on_error $LINENO' ERR
+
+on_exit() {
+  echo "${BASH_SOURCE[0]} completed successfully." >&2
+}
+
+trap on_exit EXIT
+
+## Configure docker before system starts
 
 # Write to system console and to our log file
 # See https://alestic.com/2010/12/ec2-user-data-output/
 exec > >(tee -a /var/log/elastic-stack.log | logger -t user-data -s 2>/dev/console) 2>&1
 
 
+echo Reading variables from AMI creation... >&2
 # shellcheck disable=SC1091
 source /usr/local/lib/bk-configure-docker.sh
 
-# Set user namespace remapping in config
 if [[ "${DOCKER_USERNS_REMAP:-false}" == "true" ]]; then
+  echo Configuring user namespace remapping... >&2
+
   cat <<< "$(jq '."userns-remap"="buildkite-agent"' /etc/docker/daemon.json)" > /etc/docker/daemon.json
-  cat <<EOF > /etc/subuid
+
+  echo Writing subuid... >&2
+  cat <<EOF | tee /etc/subuid
 buildkite-agent:$(id -u buildkite-agent):1
 buildkite-agent:100000:65536
 EOF
-  cat <<EOF > /etc/subgid
+
+  echo Writing subgid... >&2
+  cat <<EOF | tee /etc/subgid
 buildkite-agent:$(getent group docker | awk -F: '{print $3}'):1
 buildkite-agent:100000:65536
 EOF
+else
+  echo User namespace remapping not configured. >&2
 fi
 
-# Set experimental in config
 if [[ "${DOCKER_EXPERIMENTAL:-false}" == "true" ]]; then
+  echo Configuring experiment flag for docker daemon... >&2
   cat <<< "$(jq '.experimental=true' /etc/docker/daemon.json)" > /etc/docker/daemon.json
+else
+  echo Experiment flag for docker daemon not configured. >&2
 fi
 
-# Move docker root to the ephemeral device
 if [[ "${BUILDKITE_ENABLE_INSTANCE_STORAGE:-false}" == "true" ]]; then
+  echo Creating docker root directory in instance storage... >&2
   mkdir -p /mnt/ephemeral/docker
+  echo Configuring docker root directory to be in instance storage... >&2
   cat <<< "$(jq '."data-root"="/mnt/ephemeral/docker"' /etc/docker/daemon.json)" > /etc/docker/daemon.json
+else
+  echo Instance storage not configured. >&2
 fi
 
-# Customise address pools
-cat <<<"$(jq '."default-address-pools"=[{"base":"172.17.0.0/12","size":20},{"base":"192.168.0.0/16","size":24}]' /etc/docker/daemon.json)" >/etc/docker/daemon.json
+echo Customising docker IP address pools... >&2
+cat <<<"$(jq \
+  '."default-address-pools"=[{"base":"172.17.0.0/12","size":20},{"base":"192.168.0.0/16","size":24}]' \
+  /etc/docker/daemon.json \
+)" >/etc/docker/daemon.json
 
 # See https://docs.docker.com/build/building/multi-platform/
-echo Installing qemu binfmt for multiarch...
+echo Installing qemu binfmt for multiarch... >&2
 docker run \
   --privileged \
   --userns=host \
   --rm \
   "tonistiigi/binfmt:${QEMU_BINFMT_TAG}" \
     --install all
 
+echo Cleaning up docker images... >&2
 systemctl start docker-low-disk-gc.service
+
+echo Restarting docker daemon... >&2
 systemctl restart docker