AriasCreations/BuildEnvironments
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump Jenkins version; And make agent jars be downloaded using entrypoint

Browse source
This commit is contained in:
zontreck 2025-02-05 00:17:52 -07:00
parent aa1146789f
commit e9aed7a38b
9 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ArchAgent/Dockerfile
View file

@ -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

3
ArchAgent/entrypoint.sh
View file

@ -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"

4
DINDAgent/Dockerfile
View file

@ -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

5
DINDAgent/entrypoint.sh
View file

@ -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"

2
FirestormLinux/Dockerfile
View file

@ -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" ]

4
FirestormLinux/entrypoint.sh
View file

@ -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"

2
Jenkins/Dockerfile
View file

@ -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 /

3
LinuxGeneralCompiler/Dockerfile
View file

@ -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

2
LinuxGeneralCompiler/entrypoint.sh
View file

@ -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"