diff --git a/Dockerfile b/Dockerfile index f5e1c7d..d6173b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,13 @@ FROM tomcat:9.0.48-jdk8-openjdk-buster COPY ./target/$filename.tar.gz /smartgears-distro.tar.gz WORKDIR / RUN tar zxvf /smartgears-distro.tar.gz + RUN rm /smartgears-distro.tar.gz RUN export CATALINA_HOME=/usr/local/tomcat RUN ln -s /usr/local/tomcat tomcat RUN mv smartgears-distribution-$version smartgears-distribution ENV GHN_HOME=./smartgears-distribution - RUN ./smartgears-distribution/install -s tomcat \ No newline at end of file + RUN ./smartgears-distribution/install -s tomcat + COPY startContainer.sh /startContainer.sh + RUN chmod +x /startContainer.sh + ENTRYPOINT ["/startContainer.sh"] + CMD ["catalina.sh","run"] \ No newline at end of file diff --git a/distro/contents/samplecontainer.xml b/distro/contents/samplecontainer.xml deleted file mode 100644 index 0f565fb..0000000 --- a/distro/contents/samplecontainer.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - localhost - 8080 - gcube - - - - - - - - - it - rome - 41.9000 - 12.5000 - - - - - - - - - 60 - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 569d13b..f35c2b9 100644 --- a/pom.xml +++ b/pom.xml @@ -96,12 +96,6 @@ [2.0.0,3.0.0-SNAPSHOT) war --> - - org.gcube.core - smartgears-management - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - war - diff --git a/startContainer.sh b/startContainer.sh new file mode 100644 index 0000000..8eb2241 --- /dev/null +++ b/startContainer.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +logs=/etc/logback.xml +container=/etc/container.ini +if [ -f "$logs" ]; then + cp $logs /tomcat/lib +fi + +if [ -f "$container" ]; then + cp $container /smartgears-distribution +fi + +exec "$@"