add latest version info

Author: msagi

Makefile

@@ -1,4 +1,4 @@
-image_version=2023.04
+image_version=2023.04.17
 image_name=devsecops-base
 docker_repo=msaginwm
 
@@ -12,6 +12,9 @@ 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
 

README.md

@@ -1,28 +1,46 @@
 [![scan-container-for-vulnerabilities](https://github.com/msagi/devsecops-dockerimage/actions/workflows/container-scanning.yml/badge.svg)](https://github.com/msagi/devsecops-dockerimage/actions/workflows/container-scanning.yml)
 # Production ready Docker image for DevSecOps pipelines
+## Built from up to date Ubuntu packages, up to date DevSecOps tool versions.
+## Checked for vulnerabilities every day!
 
-## Release: 2023.4
+### Base image: 
+```
+Ubuntu (23.04)
+```
 
-### Base image:
-    Ubuntu (23.04)
+### Tools version:
+```
+[AWS]
+aws-cli/2.11.13 Python/3.11.3 Linux/5.15.49-linuxkit exe/x86_64.ubuntu.23 prompt/off
+
+[Docker]
+Docker version 23.0.3, build 3e7cbfd
+
+[kubectl]
+clientVersion:
+  buildDate: "2023-04-14T13:21:19Z"
+  compiler: gc
+  gitCommit: 4c9411232e10168d7b050c49a1b59f6df9d7ea4b
+  gitTreeState: clean
+  gitVersion: v1.27.1
+  goVersion: go1.20.3
+  major: "1"
+  minor: "27"
+  platform: linux/amd64
+kustomizeVersion: v5.0.1
+
+[make]
+GNU Make 4.3
+
+[Python]
+Python 3.11.2
+```
 
-### DevSecOps tools:
-*    aws-cli (aws-cli/2.11.11 Python/3.11.2 Linux/5.15.49-linuxkit exe/x86_64.ubuntu.23 prompt/off)
-*    docker (Docker version 23.0.3, build 3e7cbf)
-*    kubectl (Client Version: v1.26.3, Kustomize Version: v4.5.7)
-*    make (GNU Make 4.3)
-*    python3 (Python 3.11.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.
-* 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)
-* GNU Make
-    * GPL 3 - [LICENSE](https://www.gnu.org/licenses/gpl-3.0.en.html)
-* Python3
-    * PSF - [LICENSE](https://docs.python.org/3/license.html#psf-license)
+* 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.
+* 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)
+* GNU Make - GPL 3 - [LICENSE](https://www.gnu.org/licenses/gpl-3.0.en.html)
+* Python3 - PSF - [LICENSE](https://docs.python.org/3/license.html#psf-license)

install/packages/aws-cli-v2.sh

@@ -19,5 +19,10 @@ unzip awscliv2.zip
 # Install AWS CLI v2
 ./aws/install
 
+# Print version to version log
+echo "[AWS CLI v2]" >> /install/version.txt
+aws --version >> /install/version.txt
+echo "" >> /install/version.txt
+
 # Cleanup temp folders
 rm -rf ${tempFolder}

install/packages/docker.sh

@@ -27,4 +27,6 @@ apt-get install -y \
     docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
 # Verify that the installation is successful
-docker --version
+echo "[Docker]" >> /install/version.txt
+docker --version >> /install/version.txt
+echo "" >> /install/version.txt

install/packages/kubectl.sh

@@ -4,19 +4,13 @@
 apt install -y \
     curl
 
-version=v1.26.3
-
 # create temp folder
 tempFolder=/tmp/install-kubectl
 mkdir ${tempFolder}
 cd ${tempFolder}
 
 # Check for latest stable version
-latestStableVersion=$(curl -L -s https://dl.k8s.io/release/stable.txt)
-
-if "${version}" -ne "${latestStableVersion}"; then
-    echo "WARNING: New latest stable version is available: ${latestStableVersion}"
-fi
+version=$(curl -L -s https://dl.k8s.io/release/stable.txt)
 
 # Download binary linux amd64 release
 curl -LO "https://dl.k8s.io/release/${version}/bin/linux/amd64/kubectl"
@@ -35,7 +29,10 @@ fi
 # Install kubectl
 install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 
-kubectl version --client
+echo "[kubectl]" >> /install/version.txt
+kubectl version --output yaml >> /install/version.txt
+# kubectl version prints an empty line after version info
+#echo "" >> /install/version.txt
 
 # Cleanup temp folders
 rm -rf ${tempFolder}

install/packages/make.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
 
 apt install -y \
-    make
+    make
+
+echo "[make]" >> /install/version.txt
+make --version | sed '1q' >> /install/version.txt
+echo "" >> /install/version.txt

install/packages/python3.sh

@@ -5,3 +5,7 @@ apt install -y \
     python3 \
     python3-dev \
     python3-venv
+
+echo "[Python]" >> /install/version.txt
+python3 --version >> /install/version.txt
+echo "" >> /install/version.txt

version-info.txt

@@ -0,0 +1,26 @@
+[AWS CLI v2]
+aws-cli/2.11.13 Python/3.11.3 Linux/5.15.49-linuxkit exe/x86_64.ubuntu.23 prompt/off
+
+[Docker]
+Docker version 23.0.3, build 3e7cbfd
+
+[kubectl]
+clientVersion:
+  buildDate: "2023-04-14T13:21:19Z"
+  compiler: gc
+  gitCommit: 4c9411232e10168d7b050c49a1b59f6df9d7ea4b
+  gitTreeState: clean
+  gitVersion: v1.27.1
+  goVersion: go1.20.3
+  major: "1"
+  minor: "27"
+  platform: linux/amd64
+kustomizeVersion: v5.0.1
+
+
+[make]
+GNU Make 4.3
+
+[Python]
+Python 3.11.2
+