Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port domain-proxy configuration #12

Merged
merged 1 commit into from
Dec 24, 2024
+14 −18
Merged

Port domain-proxy configuration #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions src/main/java/org/jboss/pnc/konfluxtooling/prebuild/Preprocessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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>

Expand Down
Loading