From fa2da0373fb1b99f68514dfea54f48612b12c369 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 8 Dec 2023 20:41:52 -0500
Subject: [PATCH] - re-work .drone.yml

---
 .drone.yml | 111 +++++++++++++++++++++++++----------------------------
 1 file changed, 53 insertions(+), 58 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f80b9bf..20b4c04 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -16,7 +16,7 @@ trigger:
 
 
 steps:
-  - name: check_env
+  - name: check_environment
     commands:
       - hostnamectl
       - env
@@ -38,7 +38,7 @@ steps:
     commands:
       - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY
 
-  - name: docker_build
+  - name: docker_build_and_push
     environment:
       REGISTRY       :
         from_secret: build_registry
@@ -49,27 +49,7 @@ steps:
     commands:
       - echo "docker build --no-cache -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
       - docker build --no-cache -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
-
-  - name: docker_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_centos9
-    commands:
       - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
-
-  - name: docker_image_list
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_centos9
-    commands:
       - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
 
 
@@ -91,7 +71,7 @@ trigger:
 
 
 steps:
-  - name: check_env
+  - name: check_environment
     commands:
       - hostnamectl
       - env
@@ -113,7 +93,7 @@ steps:
     commands:
       - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY
 
-  - name: docker_build
+  - name: docker_build_and_push
     environment:
       REGISTRY       :
         from_secret: build_registry
@@ -124,27 +104,7 @@ steps:
     commands:
       - echo "docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
       - docker build --no-cache -f build/Containerfile.fedora39 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
-
-  - name: docker_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_fedora39
-    commands:
       - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
-
-  - name: docker_image_list
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_fedora39
-    commands:
       - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
 
 
@@ -166,7 +126,7 @@ trigger:
 
 
 steps:
-  - name: check_env
+  - name: check_environment
     commands:
       - hostnamectl
       - env
@@ -188,7 +148,7 @@ steps:
     commands:
       - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY
 
-  - name: docker_build
+  - name: docker_build_and_push
     environment:
       REGISTRY       :
         from_secret: build_registry
@@ -199,25 +159,60 @@ steps:
     commands:
       - echo "docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
       - docker build --no-cache -f build/Containerfile.debian11 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
-
-  - name: docker_push
-    environment:
-      REGISTRY       :
-        from_secret: build_registry
-      BUILD_PREFIX   :
-        from_secret: build_prefix
-      BUILD_NAME     :
-        from_secret: build_name_debian11
-    commands:
       - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
+      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
 
-  - name: docker_image_list
+
+---
+###########
+# DEBIAN 12
+###########
+kind: pipeline
+type: exec
+name: ansible_dev_debian12
+
+
+trigger:
+  branch:
+    exclude:
+      - main
+  event: [push]
+  status: [success]
+
+
+steps:
+  - name: check_environment
+    commands:
+      - hostnamectl
+      - env
+      - whoami
+      - pwd
+      - tree
+
+  - name: docker_info
+    commands:
+      - docker info
+
+  - name: docker_login
+    environment:
+      REGISTRY       : gitea.thezengarden.net
+      GITEA_USER     :
+        from_secret: gitea_user
+      GITEA_PASSWORD :
+        from_secret: gitea_password
+    commands:
+      - echo "$GITEA_PASSWORD" | docker login --username $GITEA_USER --password-stdin $REGISTRY
+
+  - name: docker_build_and_push
     environment:
       REGISTRY       :
         from_secret: build_registry
       BUILD_PREFIX   :
         from_secret: build_prefix
       BUILD_NAME     :
-        from_secret: build_name_debian11
+        from_secret: build_name_debian12
     commands:
+      - echo "docker build --no-cache -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
+      - docker build --no-cache -f build/Containerfile.debian12 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
+      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER
       - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"