From 4a053cc485d86d3949ead2f709430c2e15ebe4b8 Mon Sep 17 00:00:00 2001
From: markus <markus.pesch@cryptic.systems>
Date: Fri, 8 Jan 2021 16:53:49 +0100
Subject: [PATCH] fix: delete image after build or push, use orgsecret

---
 .drone.yml | 16 +++-------------
 .gitignore |  1 +
 Makefile   |  9 ++++++++-
 README.md  |  4 ++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8e90666..b9cc6d3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,6 @@ type: docker
 name: build-image-x86_64
 
 steps:
-
 - name: build-image-latest
   image: docker.io/volkerraschek/build-image:latest
   commands:
@@ -21,33 +20,24 @@ steps:
   - make container-image/push
   environment:
     CONTAINER_IMAGE_REGISTRY_PASSWORD:
-      from_secret: CONTAINER_IMAGE_REGISTRY_PASSWORD
+      from_secret: container_image_registry_password
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
   when:
     branch:
     - master
-    event:
-    - push
-    - cron
 
-- name: push-image-tagged
+- name: delete-image-latest
   image: docker.io/volkerraschek/build-image:latest
   commands:
-  - make container-image/push
-  environment:
-    CONTAINER_IMAGE_VERSION: ${DRONE_TAG}
-    CONTAINER_IMAGE_REGISTRY_PASSWORD:
-      from_secret: CONTAINER_IMAGE_REGISTRY_PASSWORD
+  - make container-image/delete
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
   when:
     branch:
     - master
-    event:
-    - tag
 
 - name: notify
   image: drillster/drone-email
diff --git a/.gitignore b/.gitignore
index e69de29..2eea525 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.env
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 8d93620..531482b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ CONTAINER_IMAGE_REGISTRY_NAME:=docker.io
 CONTAINER_IMAGE_REGISTRY_USER:=volkerraschek
 
 CONTAINER_IMAGE_NAMESPACE?=${CONTAINER_IMAGE_REGISTRY_USER}
-CONTAINER_IMAGE_NAME:=build-image
+CONTAINER_IMAGE_NAME:=network-tools
 CONTAINER_IMAGE_VERSION?=latest
 CONTAINER_IMAGE_FULL=${CONTAINER_IMAGE_REGISTRY_NAME}/${CONTAINER_IMAGE_NAMESPACE}/${CONTAINER_IMAGE_NAME}:${CONTAINER_IMAGE_VERSION}
 CONTAINER_IMAGE_SHORT=${CONTAINER_IMAGE_NAMESPACE}/${CONTAINER_IMAGE_NAME}:${CONTAINER_IMAGE_VERSION}
@@ -37,6 +37,13 @@ container-image/build:
 		--tag ${CONTAINER_IMAGE_SHORT} \
 		.
 
+# DELETE CONTAINER IMAGE
+# ==============================================================================
+PHONY:=container-image/delete
+container-image/delete:
+	- ${CONTAINER_RUNTIME} image rm ${CONTAINER_IMAGE_FULL} ${CONTAINER_IMAGE_SHORT}
+	- ${CONTAINER_RUNTIME} image rm ${BASE_IMAGE_FULL}
+
 # PUSH CONTAINER IMAGE
 # ==============================================================================
 PHONY+=container-image/push
diff --git a/README.md b/README.md
index 0e996c3..bc7f4ad 100644
--- a/README.md
+++ b/README.md
@@ -28,11 +28,11 @@ For a kubernetes environment you can use the [YAML-File](network-tools.yaml) by
 executing the following command.
 
 ```bash
-$ kubectl create -f https://git.cryptic.systems/volker.raschek/network-tools/network-tools.yml
+kubectl create -f https://git.cryptic.systems/volker.raschek/network-tools/network-tools.yml
 ```
 
 Execute a shell inside the container by
 
 ```bash
 kubectl exec -it network-tools -- sh
-```
\ No newline at end of file
+```