Merge pull request #12 from rnc/PROXY

Port domain-proxy configuration
project-ncl · Dec 24, 2024 · 972c84c · 972c84c
2 parents 6b319bf + 7cd5e91
commit 972c84c
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/src/main/java/org/jboss/pnc/konfluxtooling/prebuild/Preprocessor.java b/src/main/java/org/jboss/pnc/konfluxtooling/prebuild/Preprocessor.java
@@ -84,6 +84,12 @@ public void run() {
                 set -o pipefail
                 set -e
 
+                export http_proxy=http://localhost:8080
+                export https_proxy=${http_proxy}
+                export HTTP_PROXY=${http_proxy}
+                export HTTPS_PROXY=${http_proxy}
+                export ANT_OPTS="-Dhttp.proxyHost=localhost -Dhttp.proxyPort=8080"
+
                 #fix this when we no longer need to run as root
                 export HOME=${HOME:=/root}
                 # Custom base working directory.
@@ -184,6 +190,10 @@ String getContainerFile() {
                 WORKDIR /var/workdir
                 ARG PROXY_URL=""
                 ENV PROXY_URL=$PROXY_URL
+                ENV http_proxy=http://localhost:8080
+                ENV https_proxy=${http_proxy}
+                ENV HTTP_PROXY=${http_proxy}
+                ENV HTTPS_PROXY=${http_proxy}
                 COPY .jbs/run-build.sh /var/workdir
                 COPY . /var/workdir/workspace/source/
                 RUN /var/workdir/run-build.sh 2>&1 | tee /var/workdir/build.log
@@ -289,25 +299,11 @@ private String getMavenSetup() {
 
                   <proxies>
                     <proxy>
-                      <id>indy-http</id>
-                      <!-- TODO: Until domain-proxy is implemented disable this - probably needs conditional activation but settings profiles don't support interpolation -->
-                      <active>false</active>
+                      <id>domain-proxy</id>
+                      <active>true</active>
                       <protocol>http</protocol>
-                      <host>domain-proxy</host>
-                      <port>80</port>
-                      <username>${BUILD_ID}+tracking</username>
-                      <password>${ACCESS_TOKEN}</password>
-                      <nonProxyHosts>${PROXY_URL}|localhost</nonProxyHosts>
-                    </proxy>
-                    <proxy>
-                      <id>indy-https</id>
-                      <active>false</active>
-                      <protocol>https</protocol>
-                      <host>domain-proxy</host>
-                      <port>80</port>
-                      <username>${BUILD_ID}+tracking</username>
-                      <password>${ACCESS_TOKEN}</password>
-                      <nonProxyHosts>${PROXY_URL}|localhost</nonProxyHosts>
+                      <host>localhost</host>
+                      <port>8080</port>
                     </proxy>
                   </proxies>