gCubeSystem
/
hello-world-service
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing docker

This commit is contained in:
Luca Frosini 2024-11-21 16:54:19 +01:00
parent d51c1f3aad
commit fab4ffd464
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -18,10 +18,10 @@ FROM ${SMARTGEAR_IMAGE}
COPY ./dockerize/configuration/logback.xml /etc/ COPY ./dockerize/configuration/logback.xml /etc/
COPY ./dockerize/configuration/*.gcubekey /tomcat/lib 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 # In the case you have to copy a file inside the service directory
# the war must be unzipped . # 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 COPY ${CONTAINER_INI} /etc/container.ini

3
dockerize/build_conf
View File

@ -46,7 +46,8 @@ DOCKER_BUILD_NAME=$MVN_NAME:$IMAGE_VERSION
echo "DOCKER_BUILD_NAME: ${DOCKER_BUILD_NAME}" echo "DOCKER_BUILD_NAME: ${DOCKER_BUILD_NAME}"
# SMARTGEAR_IMAGE=smartgears-distribution:${SMARTGEARS_VERSION}-java${JAVA_VERSION}-tomcat${TOMCAT_VERSION} # 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}" echo "SMARTGEAR_IMAGE: ${SMARTGEAR_IMAGE}"
DOCKER_IMAGE_NAME=d4science/$DOCKER_BUILD_NAME DOCKER_IMAGE_NAME=d4science/$DOCKER_BUILD_NAME