From e9aed7a38b231e0456316cb5184ce2c52d6415b5 Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Wed, 5 Feb 2025 00:17:52 -0700
Subject: [PATCH] Bump Jenkins version; And make agent jars be downloaded using
 entrypoint

---
 ArchAgent/Dockerfile               | 1 -
 ArchAgent/entrypoint.sh            | 3 +++
 DINDAgent/Dockerfile               | 4 ----
 DINDAgent/entrypoint.sh            | 5 +++++
 FirestormLinux/Dockerfile          | 2 --
 FirestormLinux/entrypoint.sh       | 4 ++++
 Jenkins/Dockerfile                 | 2 +-
 LinuxGeneralCompiler/Dockerfile    | 3 ---
 LinuxGeneralCompiler/entrypoint.sh | 2 ++
 9 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ArchAgent/Dockerfile b/ArchAgent/Dockerfile
index 2137c89..cb1e153 100644
--- a/ArchAgent/Dockerfile
+++ b/ArchAgent/Dockerfile
@@ -13,7 +13,6 @@ RUN chmod 0600 id_rsa
 
 WORKDIR /
 
-RUN curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
 ADD ./entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
diff --git a/ArchAgent/entrypoint.sh b/ArchAgent/entrypoint.sh
index da7a8c3..208459e 100644
--- a/ArchAgent/entrypoint.sh
+++ b/ArchAgent/entrypoint.sh
@@ -1,3 +1,6 @@
 #!/bin/bash
 
+cd /
+curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
+
 java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$ARCHAGENT" -name "Arch Linux" -workDir "/builder"
diff --git a/DINDAgent/Dockerfile b/DINDAgent/Dockerfile
index b7c8eb7..46e34f0 100644
--- a/DINDAgent/Dockerfile
+++ b/DINDAgent/Dockerfile
@@ -12,10 +12,6 @@ RUN apt-get install -y openjdk-17-jdk docker-compose curl moreutils
 ADD entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 
-WORKDIR /
-
-RUN curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
-
 
 RUN mkdir /builder
 USER root
diff --git a/DINDAgent/entrypoint.sh b/DINDAgent/entrypoint.sh
index 653046d..3dac03e 100644
--- a/DINDAgent/entrypoint.sh
+++ b/DINDAgent/entrypoint.sh
@@ -16,6 +16,11 @@ docker login git.zontreck.com -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
 
 sleep 10
 
+echo "Downloading Agent..."
+
+cd /
+curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
+
 echo "Connecting agent"
 
 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/FirestormLinux/Dockerfile b/FirestormLinux/Dockerfile
index e69c6a9..b5cfd10 100644
--- a/FirestormLinux/Dockerfile
+++ b/FirestormLinux/Dockerfile
@@ -38,6 +38,4 @@ ADD ./entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 
-RUN curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
-
 ENTRYPOINT [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/FirestormLinux/entrypoint.sh b/FirestormLinux/entrypoint.sh
index 10896d1..a5edcbd 100644
--- a/FirestormLinux/entrypoint.sh
+++ b/FirestormLinux/entrypoint.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
 
+cd /
+curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
+
+
 java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$FSAGENT" -name "LinuxFS" -workDir "/builder"
diff --git a/Jenkins/Dockerfile b/Jenkins/Dockerfile
index 7a14f04..46bc2ec 100644
--- a/Jenkins/Dockerfile
+++ b/Jenkins/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update
 RUN apt-get upgrade -y
 RUN apt-get install -y openjdk-17-jdk openjdk-17-jre curl wget moreutils
 
-ENV JENKINS_VERSION 2.494
+ENV JENKINS_VERSION 2.496
 
 USER root
 WORKDIR /
diff --git a/LinuxGeneralCompiler/Dockerfile b/LinuxGeneralCompiler/Dockerfile
index 61f25d1..7e12315 100644
--- a/LinuxGeneralCompiler/Dockerfile
+++ b/LinuxGeneralCompiler/Dockerfile
@@ -13,9 +13,6 @@ ENV AGENT NAN
 
 LABEL VS_API 1.20.3
 
-WORKDIR /
-RUN curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
-
 WORKDIR /
 ADD ./entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
diff --git a/LinuxGeneralCompiler/entrypoint.sh b/LinuxGeneralCompiler/entrypoint.sh
index a9af9a9..8e42021 100644
--- a/LinuxGeneralCompiler/entrypoint.sh
+++ b/LinuxGeneralCompiler/entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd /
+curl -sO https://ci.zontreck.com/jnlpJars/agent.jar
 echo $PUB | dart pub token add https://git.zontreck.com/api/packages/AriasCreations/pub
 
 java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$AGENT" -name "Debian" -workDir "/builder"