0_nfs.sh

@@ -1,11 +1,6 @@
 #!/bin/bash
 #
 
-if [ "$EUID" -ne 0 ]; then
-    echo "This script must be run as root." >&2
-    exit 1
-fi
-
 export DEBIAN_FRONTEND=noninteractive
 apt update -qy
 apt -qy install nfs-common
@@ -24,11 +19,11 @@ function install_nfs_mnt() {
   check_dir '/var/lib/docker/volumes'
 
   echo "installing nfs mount."
-  echo "10.200.99.231:/volume1/docker/$(hostname -s)/volumes /var/lib/docker/volumes nfs auto,_netdev,x-systemd.automount 0 0" >> /etc/fstab
+  echo '10.200.99.231:/volume1/docker/volumes /var/lib/docker/volumes nfs auto,_netdev,x-systemd.automount 0 0' >> /etc/fstab
   systemctl daemon-reload
 }
 
-grep '/var/lib/docker/volumes' /etc/fstab 2>/dev/null || install_nfs_mnt
+grep '/var/lib/docker/volumes' >/dev/null || install_nfs_mnt
 
 echo ">>>>>>>>>> mounting"
 mount -a

1_setup_docker_apt_repo.sh

@@ -1,15 +1,10 @@
 #!/bin/bash
 
-if [ "$EUID" -ne 0 ]; then
-    echo "This script must be run as root." >&2
-    exit 1
-fi
-
 # REF:https://docs.docker.com/engine/install/debian/#install-using-the-repository
 
 # Add Docker's official GPG key:
-apt -y update
+apt-get update
-apt -y install ca-certificates curl gnupg
+apt-get install ca-certificates curl gnupg
 install -m 0755 -d /etc/apt/keyrings
 curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 chmod a+r /etc/apt/keyrings/docker.gpg
@@ -19,4 +14,4 @@ echo \
   "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
   "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
   tee /etc/apt/sources.list.d/docker.list > /dev/null
-apt -y update
+apt-get update

2_install_docker_pkgs.sh

@@ -1,8 +1,3 @@
 #!/bin/bash
 
-if [ "$EUID" -ne 0 ]; then
+apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
-    echo "This script must be run as root." >&2
-    exit 1
-fi
-
-apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin

3_users.sh

@@ -1,18 +1,13 @@
 #!/bin/bash
 
-if [ "$EUID" -ne 0 ]; then
-    echo "This script must be run as root." >&2
-    exit 1
-fi
-
 grep jenkins /etc/group >/dev/null 2>&1 || groupadd jenkins && echo 'jenkins group exists'
 grep jenkins /etc/passwd >/dev/null 2>&1 || useradd jenkins -g jenkins -G docker -m && echo 'jenkins user exists'
 
 [[ ! -d '/home/jenkins/.ssh' ]] && mkdir /home/jenkins/.ssh || echo '/home/jenkins/.ssh exists'
 
-grep 'jenkins@localhost.thelinuxpro.net' /home/jenkins/.ssh/authorized_keys >/dev/null 2>&1 || echo 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZzcq/InUD3bbrVC+7HzIjhaiz8Nc21ZO1Wu6OsVijs jenkins@localhost.thelinuxpro.net' >> /home/jenkins/.ssh/authorized_keys
+grep 'jenkins@localhost.thelinuxpro.net' >/dev/null 2>&1 || echo 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZzcq/InUD3bbrVC+7HzIjhaiz8Nc21ZO1Wu6OsVijs jenkins@localhost.thelinuxpro.net' >> /home/jenkins/.ssh/authorized_keys
 
-chown -R jenkins:jenkins /home/jenkins/.ssh
+chown -R jenkins.jenkins /home/jenkins/.ssh
 chmod -R 0700 /home/jenkins/.ssh
 
 usermod -a -G docker kkenny

4_provision_networks.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-if [ "$EUID" -ne 0 ]; then
-    echo "This script must be run as root." >&2
-    exit 1
-fi
-
 ip link set eth0 promisc on
 
 docker network inspect infra_dev_net >/dev/null 2>&1 || \

5_config_docker.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-if [ "$EUID" -ne 0 ]; then
-    echo "This script must be run as root." >&2
-    exit 1
-fi
-
-mkdir -p /etc/docker
-
-cat << EOF >> /etc/docker/daemon.json
-{
-	"insecure-registries" : [ "docker-registry1.in.thelinuxpro.net:5000" ],
-	"log-driver": "syslog",
-	"log-opts": {
-		"syslog-address": "udp://syslog.in.thelinuxpro.net:5514",
-		"tag": "{{.ImageName}}/{{.Name}}"
-       	}
-}
-EOF

99_upgrade.sh

@@ -1,10 +1,4 @@
 #!/bin/bash
-
-if [ "$EUID" -ne 0 ]; then
-    echo "This script must be run as root." >&2
-    exit 1
-fi
-
 export DEBIAN_FRONTEND=noninteractive
 
 apt update -qy