diff options
Diffstat (limited to 'catalog-be')
| -rw-r--r-- | catalog-be/pom.xml | 14 | ||||
| -rw-r--r-- | catalog-be/src/main/docker/backend/Dockerfile | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml index 842407eb1d..5058dc2d36 100644 --- a/catalog-be/pom.xml +++ b/catalog-be/pom.xml @@ -1369,18 +1369,18 @@ <configuration> <verbose>${verbose}</verbose> <apiVersion>${docker.api.version}</apiVersion> - <registry>nexus3.onap.org:10001</registry> + <registry>${docker.registry}</registry> <authConfig> <pull> - <username>docker</username> - <password>docker</password> + <username>${docker.username}</username> + <password>${docker.password}</password> </pull> </authConfig> <images> <!-- Build backend image --> <image> - <name>onap/sdc-backend</name> + <name>${docker.namespace}/sdc-backend</name> <alias>sdc-backend</alias> <build> <cleanup>try</cleanup> @@ -1402,7 +1402,7 @@ </image> <!-- Build backend-init image --> <image> - <name>onap/sdc-backend-init</name> + <name>${docker.namespace}/sdc-backend-init</name> <alias>sdc-backend-init</alias> <build> <cleanup>try</cleanup> @@ -1430,7 +1430,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>onap/sdc-backend,onap/sdc-backend-init</image> + <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image> </configuration> </execution> @@ -1449,7 +1449,7 @@ <goal>push</goal> </goals> <configuration> - <image>onap/sdc-backend,onap/sdc-backend-init</image> + <image>${docker.namespace}/sdc-backend,onap/sdc-backend-init</image> </configuration> </execution> </executions> diff --git a/catalog-be/src/main/docker/backend/Dockerfile b/catalog-be/src/main/docker/backend/Dockerfile index dabea05042..5e49f57202 100644 --- a/catalog-be/src/main/docker/backend/Dockerfile +++ b/catalog-be/src/main/docker/backend/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 |