diff --git a/src/main/java/org/jboss/pnc/konfluxtooling/prebuild/Preprocessor.java b/src/main/java/org/jboss/pnc/konfluxtooling/prebuild/Preprocessor.java index b28f1ee..d47a8a7 100644 --- 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() { - indy-http - - false + domain-proxy + true http - domain-proxy - 80 - ${BUILD_ID}+tracking - ${ACCESS_TOKEN} - ${PROXY_URL}|localhost - - - indy-https - false - https - domain-proxy - 80 - ${BUILD_ID}+tracking - ${ACCESS_TOKEN} - ${PROXY_URL}|localhost + localhost + 8080