aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-fe
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-fe')
-rw-r--r--catalog-fe/pom.xml12
-rw-r--r--catalog-fe/sdc-frontend/Dockerfile2
2 files changed, 5 insertions, 9 deletions
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index a43dd9a813..3848d2e8b5 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -599,10 +599,6 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <properties>
- <docker.username>docker</docker.username>
- <docker.password>docker</docker.password>
- </properties>
<build>
<plugins>
<plugin>
@@ -641,7 +637,7 @@
<configuration>
<verbose>${verbose}</verbose>
<apiVersion>${docker.api.version}</apiVersion>
- <registry>nexus3.onap.org:10001</registry>
+ <registry>${docker.registry}</registry>
<authConfig>
<pull>
<username>${docker.username}</username>
@@ -652,7 +648,7 @@
<!-- Build frontend image -->
<image>
- <name>onap/sdc-frontend</name>
+ <name>${docker.namespace}/sdc-frontend</name>
<alias>sdc-frontend</alias>
<build>
<cleanup>try</cleanup>
@@ -679,7 +675,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/sdc-frontend</image>
+ <image>${docker.namespace}/sdc-frontend</image>
</configuration>
</execution>
@@ -698,7 +694,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>onap/sdc-frontend</image>
+ <image>${docker.namespace}/sdc-frontend</image>
</configuration>
</execution>
</executions>
diff --git a/catalog-fe/sdc-frontend/Dockerfile b/catalog-fe/sdc-frontend/Dockerfile
index 9e5fad6c88..005e5c9d2b 100644
--- a/catalog-fe/sdc-frontend/Dockerfile
+++ b/catalog-fe/sdc-frontend/Dockerfile
@@ -26,7 +26,7 @@ RUN mkdir $JETTY_FOLDER && chown onap:onap $JETTY_FOLDER
USER onap
#Download jetty
-RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.41.v20210516/jetty-distribution-9.4.41.v20210516.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
+RUN wget https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.version}/jetty-distribution-${jetty.version}.tar.gz -O $JETTY_FOLDER/jetty.tar.gz && \
tar xvz -C $JETTY_FOLDER -f $JETTY_FOLDER/jetty.tar.gz --strip 1 && \
rm -rf $JETTY_FOLDER/jetty.tar.gz
RUN sed -i 's/"jetty"/"onap"/g' $JETTY_FOLDER/etc/jetty-setuid.xml