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

---
 .drone.yml | 16 +++-------------
 .gitignore |  1 +
 Makefile   |  7 +++++++
 3 files changed, 11 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore

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
new file mode 100644
index 0000000..2eea525
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.env
\ No newline at end of file
diff --git a/Makefile b/Makefile
index a23901c..22ffbc5 100644
--- a/Makefile
+++ b/Makefile
@@ -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