From 98cc6cf4dce4a54d8cf72aa1d497764942e0182c Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Thu, 7 Nov 2024 15:12:31 -0700
Subject: [PATCH] Add DIND Image

---
 .env                    |  3 ++-
 DINDAgent/Dockerfile    | 19 +++++++++++++++++++
 DINDAgent/entrypoint.sh |  5 +++++
 Jenkinsfile             | 17 +++++++++++++++++
 build.sh                |  6 +++++-
 localbuild.sh           |  4 +++-
 6 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 DINDAgent/Dockerfile
 create mode 100644 DINDAgent/entrypoint.sh

diff --git a/.env b/.env
index 22a840c..e81d99d 100644
--- a/.env
+++ b/.env
@@ -4,4 +4,5 @@ GRADLEPROP=NAN
 PUBKEY=NAN
 PRIVKEY=NAN
 PUB=NAN
-ARCHAGENT=NAN
\ No newline at end of file
+ARCHAGENT=NAN
+DINDAGENT=NAN
\ No newline at end of file
diff --git a/DINDAgent/Dockerfile b/DINDAgent/Dockerfile
new file mode 100644
index 0000000..97e9de4
--- /dev/null
+++ b/DINDAgent/Dockerfile
@@ -0,0 +1,19 @@
+FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
+
+ENV DOCKER_AGENT_SECRET NAN
+ENV DOCKER_USER NAN
+ENV DOCKER_PASSWORD NAN
+
+
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y openjdk-17-jdk docker-compose curl
+
+ADD entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+WORKDIR /
+
+RUN curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
+
+
+ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/DINDAgent/entrypoint.sh b/DINDAgent/entrypoint.sh
new file mode 100644
index 0000000..66f3726
--- /dev/null
+++ b/DINDAgent/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+docker login git.zontreck.com -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+
+java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$DOCKER_AGENT_SECRET" -name "BuilderHost" -workDir "/builder"
diff --git a/Jenkinsfile b/Jenkinsfile
index 2cbf955..8fd64f2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -216,6 +216,23 @@ pipeline {
             }
         }
 
+        stage("Build DIND Image") {
+            agent {
+                label "dockermain"
+            }
+
+            steps {
+                script {
+                    sh '''
+                    #!/bin/bash
+
+                    docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
+                    docker push git.zontreck.com/ariascreations/buildenvironments:dindagent
+                    '''
+                }
+            }
+        }
+
         stage("Clean Up Caches") {
             agent {
                 label "dockermain"
diff --git a/build.sh b/build.sh
index 1d4b1cf..fd3e7b4 100644
--- a/build.sh
+++ b/build.sh
@@ -30,4 +30,8 @@ docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBu
 docker push git.zontreck.com/ariascreations/buildenvironments:archdev
 
 docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
-docker push git.zontreck.com/ariascreations/buildenvironments:archmegapahit
\ No newline at end of file
+docker push git.zontreck.com/ariascreations/buildenvironments:archmegapahit
+
+
+docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
+docker push git.zontreck.com/ariascreations/buildenvironments:dindagent
\ No newline at end of file
diff --git a/localbuild.sh b/localbuild.sh
index e43f988..8735053 100755
--- a/localbuild.sh
+++ b/localbuild.sh
@@ -10,4 +10,6 @@ docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGen
 
 docker build -t git.zontreck.com/ariascreations/buildenvironments:arch ArchBase
 docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
-docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
\ No newline at end of file
+docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
+
+docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
\ No newline at end of file