diff options
| author |   Sebastien Premont-Tendland <sebastien.premont@bell.ca> | 2019-10-29 17:32:54 -0400 |
|---|---|---|
| committer | Sebastien Premont-Tendland <sebastien.premont@bell.ca> | 2019-11-14 13:57:45 -0500 |
| commit | 558ac2c252f5d22ff74b4f963ba1f23b26dcd248 (patch) | |
| tree | c142e0b2e8337d3daaf8833f7ccea4ef01fb638c /ms/blueprintsprocessor/distribution | |
| parent | ae02c87e1ad58dbf4997b0086815cc255e268a7b (diff) | |
Removed all http_proxy reference from build.
http_proxy is an environment configuration and should not be defined in
in the build script.
If you need to use a proxy to build docker images then add it to
the mvn command like this :
-Ddocker.buildArg.http_proxy=$PROXY -Ddocker.buildArg.https_proxy=$PROXY
Also adding http_proxy in the Dockerfile directly will add the
environment variable in the POD statically using the proxy the was
built with at runtime.
If a proxy is needed at runtime then the environment variables should be
injecting using helm charts and overrides.
Issue-ID: CCSDK-1877
Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca>
Change-Id: I2b99b277b594408c974cf29a5804384293776a22
Diffstat (limited to 'ms/blueprintsprocessor/distribution')
| -rwxr-xr-x | ms/blueprintsprocessor/distribution/pom.xml | 1 | ||||
| -rwxr-xr-x | ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ms/blueprintsprocessor/distribution/pom.xml b/ms/blueprintsprocessor/distribution/pom.xml index d568187d7..55c4a7ef3 100755 --- a/ms/blueprintsprocessor/distribution/pom.xml +++ b/ms/blueprintsprocessor/distribution/pom.xml @@ -30,7 +30,6 @@ <name.space>org.onap.ccsdk.cds</name.space> <serviceArtifactName>blueprintsprocessor</serviceArtifactName> <image.name>onap/ccsdk-blueprintsprocessor</image.name> - <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> <ccsdk.project.version>${project.version}</ccsdk.project.version> diff --git a/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile b/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile index dab0a4c01..207cec5cb 100755 --- a/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile +++ b/ms/blueprintsprocessor/distribution/src/main/docker/Dockerfile @@ -1,8 +1,5 @@ FROM omahoco1/alpine-java-python -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - # add entrypoint COPY run.source /etc/run.source COPY startService.sh /startService.sh @@ -15,4 +12,4 @@ RUN tar -xzf /source.tar.gz -C /tmp \ && rm -rf /source.tar.gz \ && rm -rf /tmp/@project.build.finalName@ -ENTRYPOINT /startService.sh
\ No newline at end of file +ENTRYPOINT /startService.sh |