From d60580e6974c2d88f050291d071ca3580d5674f2 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 7 Sep 2024 01:11:23 -0700 Subject: [PATCH] Alter format of env vars file to be compatible with Jenkins groovy --- LinuxGeneralCompiler/Dockerfile | 1 - LinuxGeneralCompiler/processData | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/LinuxGeneralCompiler/Dockerfile b/LinuxGeneralCompiler/Dockerfile index 25f0fe9..fc8ad3a 100644 --- a/LinuxGeneralCompiler/Dockerfile +++ b/LinuxGeneralCompiler/Dockerfile @@ -18,6 +18,5 @@ WORKDIR / ADD acmvn /acmvn ADD processData /processData RUN chmod +x /processData && /processData -RUN source /acmvn ENTRYPOINT [ "java", "-jar", "/agent.jar", "-url", "https://ci.zontreck.com", "-secret", "@/agent.secret", "-name", "Linux", "-workDir", "/builder" ] diff --git a/LinuxGeneralCompiler/processData b/LinuxGeneralCompiler/processData index fca7856..dc358a8 100644 --- a/LinuxGeneralCompiler/processData +++ b/LinuxGeneralCompiler/processData @@ -3,9 +3,8 @@ cd / mv acmvn{,.tmp} -echo "#!/bin/bash" > /acmvn -echo "export MVN_USER=zontreck" >> /acmvn -echo -ne "export ACMVN=" >> /acmvn +echo "env.MVN_USER=zontreck" >> /acmvn +echo -ne "env.ACMVN=" >> /acmvn cat /acmvn.tmp >> /acmvn rm /acmvn.tmp