build improved

Author: casperklein

Dockerfile

@@ -1,18 +1,18 @@
 FROM	debian:10-slim as build
 
-ENV	USER="casperklein"
-ENV	NAME="netbox-scanner"
-ENV	VERSION="2.0.0"
-
 ENV	PACKAGES="python3 python3-pip nmap"
 
+SHELL   ["/bin/bash", "-o", "pipefail", "-c"]
+
 ENV	GIT_USER="lopes"
 ENV	GIT_REPO="netbox-scanner"
 ENV	GIT_COMMIT="af65c252776127d2ab3505862fca7670e299c45c"
 ENV	GIT_ARCHIVE="https://github.com/$GIT_USER/$GIT_REPO/archive/$GIT_COMMIT.tar.gz"
 
 # Install packages
+ENV	DEBIAN_FRONTEND=noninteractive
 RUN	apt-get update \
+&&	apt-get -y upgrade \
 &&	apt-get -y install $PACKAGES \
 &&	rm -rf /var/lib/apt/lists/*
 

Makefile

@@ -1,19 +1,23 @@
 # all targets are phony (no files to check)
 .PHONY: build clean scan push
 
-USER := $(shell grep -P 'ENV\s+USER=".+?"' Dockerfile | cut -d'"' -f2)
-NAME := $(shell grep -P 'ENV\s+NAME=".+?"' Dockerfile | cut -d'"' -f2)
-VERSION := $(shell grep -P 'ENV\s+VERSION=".+?"' Dockerfile | cut -d'"' -f2)
+SHELL = /bin/bash
+
+IMAGE := $(shell jq -er '.image' < config.json)
+TAG := $(shell jq -er '"\(.image):\(.version)"' < config.json)
 
 build:
 	@./build.sh
 
 clean:
-	docker rmi $(USER)/$(NAME):$(VERSION)
+	@echo "Removing Docker images.."
+	docker rmi "$(TAG)"; \
+	docker rmi "$(IMAGE):latest"
 
 scan:
 	@./scan.sh
 
 push:
-	docker push $(USER)/$(NAME):$(VERSION)
-	docker push $(USER)/$(NAME):latest
+	@echo "Pushing image to Docker Hub.."
+	docker push "$(TAG)"
+	docker push "$(IMAGE):latest"

build.sh

@@ -2,15 +2,14 @@
 
 set -ueo pipefail
 
-USER=$(grep -P 'ENV\s+USER=".+?"' Dockerfile | cut -d'"' -f2)
-NAME=$(grep -P 'ENV\s+NAME=".+?"' Dockerfile | cut -d'"' -f2)
-VERSION=$(grep -P 'ENV\s+VERSION=".+?"' Dockerfile | cut -d'"' -f2)
-TAG="$USER/$NAME:$VERSION"
+VERSION=$(jq -er '.version'		< config.json)
+IMAGE=$(jq -er '.image'			< config.json)
+TAG=$(jq -er '"\(.image):\(.version)"'	< config.json)
 
 DIR=${0%/*}
 cd "$DIR"
 
-echo "Building: $NAME $VERSION"
+echo "Building: $TAG"
 echo
-docker build -t "$TAG" .
-docker tag "$TAG" "$USER/$NAME:latest"
+docker build -t "$TAG" --build-arg VERSION="$VERSION" .
+docker tag "$TAG" "$IMAGE:latest"

config.json

@@ -0,0 +1,6 @@
+{
+  "user": "casperklein",
+  "name": "netbox-scanner",
+  "image": "casperklein/netbox-scanner",
+  "version": "2.0.0"
+}