updates for release 2024.03.03

Author: msagi

Dockerfile

@@ -1,8 +1,11 @@
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 
 WORKDIR /
 
 COPY install install/
 
-RUN /bin/bash -c /install/install-packages.sh &&\
+# Avois "debconf: unable to initialize frontend: Dialog" errors
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN /bin/bash -c /install/install-packages.sh && \
     /bin/bash -c /install/collect-licenses.sh

Makefile

@@ -1,9 +1,18 @@
 image_version := $(shell date "+%Y.%m.%d")
-image_name=devsecops-base
-docker_repo=msaginwm
+image_name = devsecops-base
+docker_repo = msaginwm
+docker_options = --progress=plain
 
+prune:
+	docker image prune
+	$(eval docker_options += --no-cache)
+	
 build:
-	docker build -t ${docker_repo}/${image_name}:${image_version} .
+	docker build ${docker_options} -t ${docker_repo}/${image_name}:${image_version} .
+	docker run ${docker_repo}/${image_name}:${image_version} cat /install/version.txt > version-info.txt
+	docker run ${docker_repo}/${image_name}:${image_version} cat /install/packages.txt > packages-info.txt
+
+rebuild: prune build
 
 deploy:
 	docker tag ${docker_repo}/${image_name}:${image_version} ${docker_repo}/${image_name}:latest
@@ -12,10 +21,4 @@ deploy:
 run:
 	docker run --interactive --tty ${docker_repo}/${image_name}:${image_version} /bin/bash 
 
-version-info:
-	docker run ${docker_repo}/${image_name}:${image_version} cat /install/version.txt > version-info.txt
-
-packages-info:
-	docker run ${docker_repo}/${image_name}:${image_version} /bin/apt list --installed > packages-info.txt
-
 all: build

README.md

@@ -5,39 +5,39 @@
 
 ### Base image: 
 ```
-Ubuntu (23.10)
+Ubuntu (24.04)
 ```
 
 ### Tools version:
 ```
 [AWS CLI v2]
-aws-cli/2.12.6 Python/3.11.4 Linux/5.15.49-linuxkit-pr exe/x86_64.ubuntu.23 prompt/off
+aws-cli/2.15.25 Python/3.11.8 Linux/6.6.16-linuxkit exe/x86_64.ubuntu.24 prompt/off
 
 [Docker]
-Docker version 24.0.2, build cb74dfc
+Docker version 25.0.3, build 4debf41
 
 [kubectl]
 clientVersion:
-  buildDate: "2023-06-14T09:53:42Z"
+  buildDate: "2024-02-14T10:40:49Z"
   compiler: gc
-  gitCommit: 25b4e43193bcda6c7328a6d147b1fb73a33f1598
+  gitCommit: 4b8e819355d791d96b7e9d9efe4cbafae2311c88
   gitTreeState: clean
-  gitVersion: v1.27.3
-  goVersion: go1.20.5
+  gitVersion: v1.29.2
+  goVersion: go1.21.7
   major: "1"
-  minor: "27"
+  minor: "29"
   platform: linux/amd64
-kustomizeVersion: v5.0.1
+kustomizeVersion: v5.0.4-0.20230601165947-6ce0bf390ce3
 
 [make]
 GNU Make 4.3
 
 [Python]
-Python 3.11.4
+Python 3.12.2
 ```
 
 ### Lincenses for components used in the image:
-* Ubuntu 23.04 - Ubuntu is an aggregate work of many works, each covered by their own licence(s) which are available under /usr/share/doc/PACKAGE/copyright.
+* Ubuntu 24.04 - Ubuntu is an aggregate work of many works, each covered by their own licence(s) which are available under /usr/share/doc/PACKAGE/copyright.
 * AWS CLI - Apache 2.0 - [LICENSE](https://github.com/aws/aws-cli/blob/v2/LICENSE.txt)
 * Docker - Apache 2.0 - [LICENSE](https://github.com/docker/docs/blob/main/LICENSE)
 * Kubernetes - Apache 2.0 - [LICENSE](https://github.com/kubernetes/k8s.io/blob/main/LICENSE)

install/install-packages.sh

@@ -1,16 +1,25 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 echo "################################"
 echo "# DevSecOps base image builder #"
 echo "################################"
 
 # Update the apt package index
-apt update
-apt list --upgradable
+apt-get update
 # Upgrade existing packages
-apt upgrade
+apt-get upgrade
+apt-get install -y \
+  apt-utils
 
 # Install additional packages
-for f in /install/packages/*.sh; do
+files=$(find /install/packages -type f -iname "*.sh" | sort)
+
+for f in $files; do
+  echo ">>> Installing [$f]..."
   bash "$f" || exit -1  # execute successfully or break
+  echo ">>> Installing [$f] done."
 done
-    
+
+# Print installed packages
+echo "Printing installed packages to file..."
+apt list --installed >> /install/packages.txt
+echo "Done."

install/packages/python3.sh install/packages/00-python3.shinstall/packages/python3.sh renamed to install/packages/00-python3.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Install Python and its dev packages
-apt install -y \
+apt-get install -y \
     python3 \
     python3-dev \
     python3-venv

install/packages/aws-cli-v2.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Install dependencies
-apt install -y \
+apt-get install -y \
     curl \
     unzip
 

install/packages/docker-ubuntu-23.10.sh-disabled

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# Uninstall old Docker versions (if any)
+#apt-get remove docker docker-engine docker.io containerd runc
+
+# create temp folder
+tempFolder=/tmp/install-docker
+mkdir ${tempFolder}
+cd ${tempFolder}
+
+# Install dependencies
+apt-get install -y \
+    ca-certificates \
+    curl \
+    gnupg
+
+# Add Docker’s official GPG key
+mkdir -m 0755 -p /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+
+# Set up the repository
+versionCodeName=$(. /etc/os-release && echo "$VERSION_CODENAME")
+echo "Host version code name is '${versionCodeName}'" > ${tempFolder}/host-version-codename.log
+# Ubuntu 23.10 "mantic" version is not yet released from docker: falling back to Ubuntu 23.04 "lunar"
+if [ "${versionCodeName}" == "mantic" ]; then
+  versionCodeName=lunar
+else
+  echo "Target distro is '${versionCodeName}'" > ${tempFolder}/target-distro.log
+fi
+echo \
+  "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+  "${versionCodeName}" stable" | \
+  tee /etc/apt/sources.list.d/docker.list > ${tempFolder}/docker.list.log
+
+# Update the apt package index
+apt-get update
+
+# Install Docker Engine, containerd, and Docker Compose
+apt-get install -y \
+    docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
+# Verify that the installation is successful
+echo "[Docker]" >> /install/version.txt
+docker --version >> /install/version.txt
+echo "" >> /install/version.txt
+
+# Cleanup temp folders
+rm -rf ${tempFolder}

install/packages/docker.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-# Uninstall old Docker versions (if any)
-#apt-get remove docker docker-engine docker.io containerd runc
+# Install latest docker packages for Ubuntu 24.04
+# credits: https://kifarunix.com/how-to-install-docker-on-ubuntu-24-04/?expand_article=1#docker-repos
 
 # create temp folder
 tempFolder=/tmp/install-docker
@@ -10,34 +10,28 @@ cd ${tempFolder}
 
 # Install dependencies
 apt-get install -y \
-    ca-certificates \
-    curl \
-    gnupg
+  apt-transport-https \
+	ca-certificates \
+	curl \
+	gnupg-agent \
+	software-properties-common
 
 # Add Docker’s official GPG key
 mkdir -m 0755 -p /etc/apt/keyrings
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-
-# Set up the repository
-versionCodeName=$(. /etc/os-release && echo "$VERSION_CODENAME")
-echo "Host version code name is '${versionCodeName}'" > ${tempFolder}/host-version-codename.log
-# Ubuntu 23.10 "mantic" version is not yet released from docker: falling back to Ubuntu 23.04 "lunar"
-if [ "${versionCodeName}" == "mantic" ]; then
-  versionCodeName=lunar
-else
-  echo "Target distro is '${versionCodeName}'" > ${tempFolder}/target-distro.log
-fi
-echo \
-  "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
-  "${versionCodeName}" stable" | \
-  tee /etc/apt/sources.list.d/docker.list > ${tempFolder}/docker.list.log
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/docker.gpg
+
+# Note that as of this writing, Docker-CE repos is not yet available for Ubuntu 24.04 Noble Numbat. 
+# We will use Docker repos for Ubuntu 22.04 Jammy for now. However, if you want, you can install the 
+# Docker packages that ships with Ubuntu 24.04 by default, docker.io. This may not provide the latest 
+# release versions of Docker though.
+echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu jammy stable" | tee /etc/apt/sources.list.d/docker-ce.list
 
 # Update the apt package index
 apt-get update
 
 # Install Docker Engine, containerd, and Docker Compose
 apt-get install -y \
-    docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+  docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
 # Verify that the installation is successful
 echo "[Docker]" >> /install/version.txt

install/packages/kubectl.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Install dependencies
-apt install -y \
+apt-get install -y \
     curl
 
 # create temp folder

install/packages/make.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-apt install -y \
+apt-get install -y \
     make
 
 echo "[make]" >> /install/version.txt