From 7b704ec87950f48db06d4f517eb3ef881f7b2f7c Mon Sep 17 00:00:00 2001
From: Joerg Bolay <joerg.bolay@dataport.de>
Date: Wed, 12 Jun 2024 16:22:59 +0200
Subject: [PATCH] KOP-2329 verwende environment variable als proxy
---
.gitlab-ci.yml | 1 +
.m2/settings.xml | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 620eae0..9bfc071 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ cache:
package:
stage: deploy
script:
+ - export DATAPORT_PROXY=$DATAPORT_PROXY
- mvn $MAVEN_CLI_OPTS package
artifacts:
paths:
diff --git a/.m2/settings.xml b/.m2/settings.xml
index 0a02e4e..7a5f70a 100644
--- a/.m2/settings.xml
+++ b/.m2/settings.xml
@@ -37,14 +37,6 @@
<proxies>
<proxy>
<id>dataport-proxy</id>
- <active>false</active>
- <protocol>http</protocol>
- <host>10.65.108.2</host>
- <port>${env.DATAPORT_PROXY_PORT}</port>
- <nonProxyHosts>localhost,127.0.0.1,*.dataport.de</nonProxyHosts>
- </proxy>
- <proxy>
- <id>dataport-gitlab-proxy</id>
<active>true</active>
<protocol>http</protocol>
<host>${env.DATAPORT_PROXY}</host>
--
GitLab