diff --git a/Dockerfile b/Dockerfile index 2439d2f..8ea54df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat:9.0.85-jdk11-temurin-jammy +FROM tomcat:10.1.19-jdk11-temurin-jammy ARG filename=smartgears-distribution-4.0.0-SNAPSHOT ARG version=4.0.0-SNAPSHOT COPY ./target/$filename.tar.gz /smartgears-distro.tar.gz @@ -10,7 +10,7 @@ FROM tomcat:9.0.85-jdk11-temurin-jammy RUN mv smartgears-distribution-$version smartgears-distribution ENV GHN_HOME=./smartgears-distribution RUN ./smartgears-distribution/install -s tomcat - COPY startContainer.sh /startContainer.sh + COPY exec/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/buildDistribution.sh b/buildDistribution.sh new file mode 100755 index 0000000..1aac67d --- /dev/null +++ b/buildDistribution.sh @@ -0,0 +1,58 @@ +#!/bin/bash + +################################################################################ +# Help # +################################################################################ +Help() +{ + # Display Help + echo "build and create docker image form smartgears distribution" + echo + echo "Syntax: buildDistribution [-g arg] [-p|u|h]" + echo "options:" + echo "g arg specifies the maven goal {package, install, deploy etc} default is package." + echo "p build docker image for multiple platform (must be suppported by local docker agent)" + echo "u push image to dockerhub (with docker login already done)" + echo "h Print this Help." + echo +} + +################################################################################ +################################################################################ +# Main program # +################################################################################ +################################################################################ + + +set -e + +image_version=4.0.0-SNAPSHOT-java11-tomcat10.1.19 +push=false + +while getopts g:puh flag +do + case "${flag}" in + g) goal=${OPTARG};; + p) platform=true ;; + u) push=true ;; + h) Help + exit 0;; + *) echo "Invalid option" + exit 1;; + esac +done +echo "goal: $goal"; +echo "platform: $platform"; + +if [ -z ${goal} ]; then mvn clean package; else mvn clean ${goal}; fi + +if [ -z ${platform} ]; + then docker build -t smartgears-distribution:${image_version} .; + else docker build -t smartgears-distribution:${image_version} --platform=linux/amd64,linux/arm64,linux/arm/v7 . ; +fi + +docker tag smartgears-distribution:${image_version} d4science/smartgears-distribution:${image_version} + +if [ ${push} = true ]; then + docker push d4science/smartgears-distribution:${image_version}; +fi \ No newline at end of file diff --git a/startContainer.sh b/exec/startContainer.sh similarity index 100% rename from startContainer.sh rename to exec/startContainer.sh diff --git a/pom.xml b/pom.xml index 031e522..7a1fa91 100644 --- a/pom.xml +++ b/pom.xml @@ -77,11 +77,6 @@ org.gcube.common common-utility-sg4 - - org.gcube.information-system - resource-registry-publisher-connector - [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - org.gcube.data.publishing document-store-lib-accounting-service @@ -100,6 +95,14 @@ probe war + + org.gcube.common.core legacy-is-publisher-connector