From 13a63c6a86f9484ecc11be1145ecd8f9761d6f77 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 8 Dec 2023 15:31:18 -0500
Subject: [PATCH 1/4] remove line break to kick of first test job to see where
 we're at

---
 .drone.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 80c44e2..79c01c2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,6 @@ kind: pipeline
 type: exec
 name: ansible_dev_centos_stream9
 
-
 trigger:
   branch:
     exclude:

From 3db21a1a13dc3a56a6dc0cf0551e5a25077bdda9 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 8 Dec 2023 15:35:09 -0500
Subject: [PATCH 2/4] update command

---
 .drone.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 79c01c2..93c61a9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,24 +41,24 @@ steps:
       BUILD_NAME     : centos9
       BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
     commands:
-      - echo "docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$BUILD_TAG ."
-      - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$BUILD_TAG .
+      - echo "docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH ."
+      - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
 
-  - name: docker_push
-    environment:
-      REGISTRY       : gitea.thezengarden.net
-      BUILD_PREFIX   : podman/ansible-dev
-      BUILD_NAME     : centos9
-      BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
-    commands:
-      - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$BUILD_TAG
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
+  # - name: docker_push
+  #   environment:
+  #     REGISTRY       : gitea.thezengarden.net
+  #     BUILD_PREFIX   : podman/ansible-dev
+  #     BUILD_NAME     : centos9
+  #     BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
+  #   commands:
+  #     - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$BUILD_TAG
+  #     - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
 
-  - name: docker_images
-    environment:
-      REGISTRY       : gitea.thezengarden.net
-      BUILD_PREFIX   : podman/ansible-dev
-      BUILD_NAME     : centos9
-      BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
-    commands:
-      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
+  # - name: docker_images
+  #   environment:
+  #     REGISTRY       : gitea.thezengarden.net
+  #     BUILD_PREFIX   : podman/ansible-dev
+  #     BUILD_NAME     : centos9
+  #     BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
+  #   commands:
+  #     - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"

From 6aab3ac8660aab1a8e38f0897eb1b78801c4514b Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 8 Dec 2023 15:37:20 -0500
Subject: [PATCH 3/4] fix requirements.txt missing; update docker build command

---
 .drone.yml                         | 4 ++--
 build/Containerfile.centos-stream9 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 93c61a9..45a3bed 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,8 +41,8 @@ steps:
       BUILD_NAME     : centos9
       BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
     commands:
-      - echo "docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH ."
-      - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH .
+      - echo "docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
+      - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
 
   # - name: docker_push
   #   environment:
diff --git a/build/Containerfile.centos-stream9 b/build/Containerfile.centos-stream9
index ae250b9..a7e840e 100644
--- a/build/Containerfile.centos-stream9
+++ b/build/Containerfile.centos-stream9
@@ -8,7 +8,7 @@ RUN  mkdir -p /root/.ssh
 COPY conf/ssh_config /root/.ssh/config
 COPY conf/hosts /etc/hosts
 COPY conf/dnf.conf /etc/dnf/dnf.conf
-# COPY python/requirements.txt /tmp/requirements.txt
+COPY python/requirements.txt /tmp/requirements.txt
 
 # RUN dnf install -y python3-pip git ansible-core python3-ansible-lint
 RUN dnf update -y \

From d5ed33448c99f6872a858f64aefe7a8b43f940a8 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 8 Dec 2023 15:43:16 -0500
Subject: [PATCH 4/4] testing secret usage; running everything

---
 .drone.yml | 48 +++++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 45a3bed..4996e04 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -36,29 +36,35 @@ steps:
 
   - name: docker_build
     environment:
-      REGISTRY       : gitea.thezengarden.net
-      BUILD_PREFIX   : podman/ansible-dev
-      BUILD_NAME     : centos9
-      BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
+      REGISTRY       :
+        from_secret: build_registry
+      BUILD_PREFIX   :
+        from_secret: build_prefix
+      BUILD_NAME     :
+        from_secret: build_name_centos9
     commands:
       - echo "docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER ."
       - docker build -f build/Containerfile.centos-stream9 -t $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER .
 
-  # - name: docker_push
-  #   environment:
-  #     REGISTRY       : gitea.thezengarden.net
-  #     BUILD_PREFIX   : podman/ansible-dev
-  #     BUILD_NAME     : centos9
-  #     BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
-  #   commands:
-  #     - docker push $REGISTRY/$BUILD_PREFIX/$BUILD_NAME:$BUILD_TAG
-  #     - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
+  - 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
+      - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
 
-  # - name: docker_images
-  #   environment:
-  #     REGISTRY       : gitea.thezengarden.net
-  #     BUILD_PREFIX   : podman/ansible-dev
-  #     BUILD_NAME     : centos9
-  #     BUILD_TAG      : "$CI_COMMIT_BRANCH-$CI_BUILD_NUMBER"
-  #   commands:
-  #     - docker images | grep "$REGISTRY/$BUILD_PREFIX/$BUILD_NAME"
+  - 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"