From 289395a327fe4b298e1e7d7ccd730f3aeb7aad0f Mon Sep 17 00:00:00 2001
From: Bram Prieshof <brammp@noreply.bprieshof.nl>
Date: Fri, 10 Sep 2021 22:15:12 +0000
Subject: [PATCH] Update 'Debian.yaml'

---
 Debian.yaml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Debian.yaml b/Debian.yaml
index 545d2e0..8bfabe4 100644
--- a/Debian.yaml
+++ b/Debian.yaml
@@ -866,6 +866,17 @@ packages:
   update: true
   cleanup: true
   sets:
+
+  #Https Repo pkgs    
+  - packages:
+    - gpg
+    - curl
+    - ca-certificates
+    action: install
+    early: true
+    variants:
+    - jenkins
+
   #Minimal pkgs
   - packages:
     - dialog
@@ -919,9 +930,7 @@ packages:
 
 #Jenkins pkgs    
   - packages:
-    - gpg
-    - curl
-    - ca-certificates 
+    - jenkins
     - gcc
     - libc-dev   
     action: install
@@ -935,13 +944,14 @@ packages:
       {% if image.release == "bullseye" %} deb http://deb.debian.org/debian {{ image.release }}-updates main contrib{% endif %}
       {% if image.release == "bullseye" %} deb http://security.debian.org {{ image.release }}-security main contrib{% endif %}
       {% if image.release != "sid" and image.release != "bullseye" and not (image.release == "wheezy" and image.architecture_mapped == "powerpc") and not (image.release == "wheezy" and image.architecture_mapped == "s390x") %}deb http://security.debian.org/debian-security {{ image.release }}/updates main{% endif %}
+      {% if image.variant == "jenkins" %}deb [signed-by=/usr/share/keyrings/jenkins-keyring.gpg] https://pkg.jenkins.io/debian-stable binary/{% endif %}
 
 actions:
 - trigger: post-unpack
   action: |-
     #!/bin/sh
-    echo 'Acquire::http::Proxy "http://192.168.2.83:80";' > /etc/apt/apt.conf.d/01prox
-    echo '#Acquire::http::Proxy "http://192.168.200.60:80";' >> /etc/apt/apt.conf.d/01prox
+    echo 'Acquire::http::Proxy "http://192.168.2.83";' > /etc/apt/apt.conf.d/01prox
+    echo '#Acquire::http::Proxy "http://192.168.2.83";' >> /etc/apt/apt.conf.d/01prox
 
 - trigger: post-packages
   action: |-
@@ -974,14 +984,11 @@ actions:
   - jenkinsbuilder
   - imgbuilder
 
-- trigger: post-packages
+#Jenkins Repo key
+- trigger: post-unpack
   action: |-
     #!/bin/sh
     curl --retry 7 --retry-delay 5 -s https://pkg.jenkins.io/debian-stable/jenkins.io.key  | gpg --dearmor >  /usr/share/keyrings/jenkins-keyring.gpg
-    echo "deb [signed-by=/usr/share/keyrings/jenkins-keyring.gpg] https://pkg.jenkins.io/debian-stable binary/" >/etc/apt/sources.list.d/jenkins.list
-    apt update
-    apt install jenkins --no-install-recommends -y
-    apt clean all
   variants:
   - jenkins