From fab4ffd464ca5de4b75ea5cb00b229ff6fd6dfb8 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 21 Nov 2024 16:54:19 +0100 Subject: [PATCH] Fixing docker --- Dockerfile | 4 ++-- dockerize/build_conf | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd6c330..e7e4f60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,10 @@ FROM ${SMARTGEAR_IMAGE} COPY ./dockerize/configuration/logback.xml /etc/ COPY ./dockerize/configuration/*.gcubekey /tomcat/lib - COPY ./target/${MVN_FINALNAME}.war /usr/local/tomcat/webapps/ + COPY ./target/${MVN_FINALNAME}.war /usr/local/tomcat/webapps/${MVN_NAME}.war # In the case you have to copy a file inside the service directory # the war must be unzipped . - # RUN unzip /target/${MVN_FINALNAME}.war -d /tomcat/webapps/${MVN_NAME} + # RUN unzip /target/${MVN_NAME}.war -d /tomcat/webapps/${MVN_NAME} COPY ${CONTAINER_INI} /etc/container.ini diff --git a/dockerize/build_conf b/dockerize/build_conf index d39b9f7..f43597c 100644 --- a/dockerize/build_conf +++ b/dockerize/build_conf @@ -46,7 +46,8 @@ DOCKER_BUILD_NAME=$MVN_NAME:$IMAGE_VERSION echo "DOCKER_BUILD_NAME: ${DOCKER_BUILD_NAME}" # SMARTGEAR_IMAGE=smartgears-distribution:${SMARTGEARS_VERSION}-java${JAVA_VERSION}-tomcat${TOMCAT_VERSION} -SMARTGEAR_IMAGE=hub.dev.d4science.org/gcube/smartgears-distribution:${SMARTGEARS_VERSION}-java${JAVA_VERSION}-tomcat${TOMCAT_VERSION} +# SMARTGEAR_IMAGE=hub.dev.d4science.org/gcube/smartgears-distribution:${SMARTGEARS_VERSION}-java${JAVA_VERSION}-tomcat${TOMCAT_VERSION} +SMARTGEAR_IMAGE=harbor.d4science.org/gcube/smartgears-distribution:${SMARTGEARS_VERSION}-java${JAVA_VERSION}-tomcat${TOMCAT_VERSION} echo "SMARTGEAR_IMAGE: ${SMARTGEAR_IMAGE}" DOCKER_IMAGE_NAME=d4science/$DOCKER_BUILD_NAME