From e4093b908fdbc4a00bfd0227dec0d155f21f4fd7 Mon Sep 17 00:00:00 2001
From: Markus Pesch <markus.pesch@cryptic.systems>
Date: Mon, 22 Aug 2022 12:43:37 +0200
Subject: [PATCH] fix(ci): typos

---
 .drone.yml |  6 +++---
 Makefile   | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index bf5e485..58eea50 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -442,7 +442,7 @@ steps:
     password:
       from_secret: container_image_registry_password
     build_args:
-    - HELM_VERSION=${DRONE_TAG}
+    - GOSEC_VERSION=${DRONE_TAG}
     no_cache: true
 
 - name: email-notification
@@ -491,7 +491,7 @@ steps:
     password:
       from_secret: container_image_registry_password
     build_args:
-    - HELM_VERSION=${DRONE_TAG}
+    - GOSEC_VERSION=${DRONE_TAG}
     no_cache: true
 
 - name: email-notification
@@ -540,7 +540,7 @@ steps:
     password:
       from_secret: container_image_registry_password
     build_args:
-    - HELM_VERSION=${DRONE_TAG}
+    - GOSEC_VERSION=${DRONE_TAG}
     no_cache: true
 
 - name: email-notification
diff --git a/Makefile b/Makefile
index 4222099..19db93d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,18 +5,18 @@ GOSEC_VERSION?=v2.12.0 # renovate: datasource=github-releases depName=securego/g
 # CONTAINER_RUNTIME
 # The CONTAINER_RUNTIME variable will be used to specified the path to a
 # container runtime. This is needed to start and run a container image.
-CONTAINER_RUNTIME?=$(shell which docker)
+CONTAINER_RUNTIME?=$(shell which podman)
 
-# HELM_IMAGE_REGISTRY_NAME
+# GOSEC_IMAGE_REGISTRY_NAME
 # Defines the name of the new container to be built using several variables.
-HELM_IMAGE_REGISTRY_NAME:=docker.io
-HELM_IMAGE_REGISTRY_USER:=volkerraschek
+GOSEC_IMAGE_REGISTRY_NAME:=docker.io
+GOSEC_IMAGE_REGISTRY_USER:=volkerraschek
 
-HELM_IMAGE_NAMESPACE?=${HELM_IMAGE_REGISTRY_USER}
-HELM_IMAGE_NAME:=gosec
-HELM_IMAGE_VERSION?=latest
-HELM_IMAGE_FULLY_QUALIFIED=${HELM_IMAGE_REGISTRY_NAME}/${HELM_IMAGE_NAMESPACE}/${HELM_IMAGE_NAME}:${HELM_IMAGE_VERSION}
-HELM_IMAGE_UNQUALIFIED=${HELM_IMAGE_NAMESPACE}/${HELM_IMAGE_NAME}:${HELM_IMAGE_VERSION}
+GOSEC_IMAGE_NAMESPACE?=${GOSEC_IMAGE_REGISTRY_USER}
+GOSEC_IMAGE_NAME:=gosec
+GOSEC_IMAGE_VERSION?=latest
+GOSEC_IMAGE_FULLY_QUALIFIED=${GOSEC_IMAGE_REGISTRY_NAME}/${GOSEC_IMAGE_NAMESPACE}/${GOSEC_IMAGE_NAME}:${GOSEC_IMAGE_VERSION}
+GOSEC_IMAGE_UNQUALIFIED=${GOSEC_IMAGE_NAMESPACE}/${GOSEC_IMAGE_NAME}:${GOSEC_IMAGE_VERSION}
 
 # BUILD CONTAINER IMAGE
 # ==============================================================================
@@ -27,23 +27,23 @@ container-image/build:
 		--file Dockerfile \
 		--no-cache \
 		--pull \
-		--tag ${HELM_IMAGE_FULLY_QUALIFIED} \
-		--tag ${HELM_IMAGE_UNQUALIFIED} \
+		--tag ${GOSEC_IMAGE_FULLY_QUALIFIED} \
+		--tag ${GOSEC_IMAGE_UNQUALIFIED} \
 		.
 
 # DELETE CONTAINER IMAGE
 # ==============================================================================
 PHONY:=container-image/delete
 container-image/delete:
-	- ${CONTAINER_RUNTIME} image rm ${HELM_IMAGE_FULLY_QUALIFIED} ${HELM_IMAGE_UNQUALIFIED}
+	- ${CONTAINER_RUNTIME} image rm ${GOSEC_IMAGE_FULLY_QUALIFIED} ${GOSEC_IMAGE_UNQUALIFIED}
 	- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}
 
 # PUSH CONTAINER IMAGE
 # ==============================================================================
 PHONY+=container-image/push
 container-image/push:
-	echo ${HELM_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${HELM_IMAGE_REGISTRY_NAME} --username ${HELM_IMAGE_REGISTRY_USER} --password-stdin
-	${CONTAINER_RUNTIME} push ${HELM_IMAGE_FULLY_QUALIFIED}
+	echo ${GOSEC_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${GOSEC_IMAGE_REGISTRY_NAME} --username ${GOSEC_IMAGE_REGISTRY_USER} --password-stdin
+	${CONTAINER_RUNTIME} push ${GOSEC_IMAGE_FULLY_QUALIFIED}
 
 # PHONY
 # ==============================================================================