Compare commits
3 Commits
6bc3bd6714
...
b41aeaaf75
Author | SHA1 | Date |
---|---|---|
Alfredo Oliviero | b41aeaaf75 | |
Alfredo Oliviero | dcecfe224c | |
Alfredo Oliviero | 9d52aef7cb |
|
@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
||||||
|
|
||||||
# Changelog for Smartgears Distribution
|
# Changelog for Smartgears Distribution
|
||||||
|
|
||||||
|
## [v4.0.1-SNAPSHOT] - 2022-03-30
|
||||||
|
|
||||||
|
- new version number
|
||||||
|
|
||||||
## [v4.0.0-SNAPSHOT] - 2022-03-30
|
## [v4.0.0-SNAPSHOT] - 2022-03-30
|
||||||
|
|
||||||
- moving to smartgears-4.0.0
|
- moving to smartgears-4.0.0
|
||||||
|
|
12
Dockerfile
12
Dockerfile
|
@ -1,8 +1,10 @@
|
||||||
ARG JAVA_VERSION=11
|
ARG JAVA_VERSION=11
|
||||||
FROM tomcat:10.1.19-jdk$JAVA_VERSION-temurin-jammy
|
|
||||||
ARG filename=smartgears-distribution-4.0.0-SNAPSHOT
|
FROM tomcat:10.1.19-jdk${JAVA_VERSION}-temurin-jammy
|
||||||
ARG version=4.0.0-SNAPSHOT
|
ARG SMARTGEARS_VERSION=""
|
||||||
COPY ./target/$filename.tar.gz /smartgears-distro.tar.gz
|
ENV FILENAME=smartgears-distribution-${SMARTGEARS_VERSION}
|
||||||
|
|
||||||
|
COPY ./target/${FILENAME}.tar.gz /smartgears-distro.tar.gz
|
||||||
WORKDIR /
|
WORKDIR /
|
||||||
# all file and folder in etc/config are moved to the smartgears applications configuration directory
|
# all file and folder in etc/config are moved to the smartgears applications configuration directory
|
||||||
# for specific application configuration ( configuration file for app with contextPath "contextPath" must be placed in /etc/config/contextPath)
|
# for specific application configuration ( configuration file for app with contextPath "contextPath" must be placed in /etc/config/contextPath)
|
||||||
|
@ -11,7 +13,7 @@ FROM tomcat:10.1.19-jdk$JAVA_VERSION-temurin-jammy
|
||||||
RUN rm /smartgears-distro.tar.gz
|
RUN rm /smartgears-distro.tar.gz
|
||||||
RUN export CATALINA_HOME=/usr/local/tomcat
|
RUN export CATALINA_HOME=/usr/local/tomcat
|
||||||
RUN ln -s /usr/local/tomcat tomcat
|
RUN ln -s /usr/local/tomcat tomcat
|
||||||
RUN mv smartgears-distribution-$version smartgears-distribution
|
RUN mv smartgears-distribution-$SMARTGEARS_VERSION smartgears-distribution
|
||||||
ENV GHN_HOME=./smartgears-distribution
|
ENV GHN_HOME=./smartgears-distribution
|
||||||
RUN ./smartgears-distribution/install -s tomcat
|
RUN ./smartgears-distribution/install -s tomcat
|
||||||
COPY tomcat_files/startContainer.sh /startContainer.sh
|
COPY tomcat_files/startContainer.sh /startContainer.sh
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
# Acknowledgments
|
||||||
|
|
||||||
|
The projects leading to this software have received funding from a series of European Union programmes including:
|
||||||
|
|
||||||
|
- the Sixth Framework Programme for Research and Technological Development
|
||||||
|
- [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
|
||||||
|
- the Seventh Framework Programme for research, technological development and demonstration
|
||||||
|
- [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
|
||||||
|
- [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
|
||||||
|
- [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
|
||||||
|
- [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
|
||||||
|
- [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
|
||||||
|
- the H2020 research and innovation programme
|
||||||
|
- [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
|
||||||
|
- [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
|
||||||
|
- [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
|
||||||
|
- [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
|
||||||
|
- [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
|
||||||
|
- [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
|
||||||
|
- [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
|
||||||
|
- [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
|
||||||
|
- [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
|
||||||
|
- [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
|
||||||
|
- [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
|
||||||
|
- [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
|
||||||
|
- [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);
|
24
README.md
24
README.md
|
@ -6,6 +6,8 @@ A set of gCube library which empower a servlet container (e.g. tomcat) with a se
|
||||||
- authorization
|
- authorization
|
||||||
- accounting
|
- accounting
|
||||||
|
|
||||||
|
## Structure of the project
|
||||||
|
|
||||||
|
|
||||||
## Built With
|
## Built With
|
||||||
|
|
||||||
|
@ -55,26 +57,6 @@ open-source software toolkit used for building and operating Hybrid Data
|
||||||
Infrastructures enabling the dynamic deployment of Virtual Research Environments
|
Infrastructures enabling the dynamic deployment of Virtual Research Environments
|
||||||
by favouring the realisation of reuse oriented policies.
|
by favouring the realisation of reuse oriented policies.
|
||||||
|
|
||||||
The projects leading to this software have received funding from a series of European Union programmes including:
|
The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)
|
||||||
|
|
||||||
- the Sixth Framework Programme for Research and Technological Development
|
|
||||||
- DILIGENT (grant no. 004260).
|
|
||||||
- the Seventh Framework Programme for research, technological development and demonstration
|
|
||||||
- D4Science (grant no. 212488);
|
|
||||||
- D4Science-II (grant no.239019);
|
|
||||||
- ENVRI (grant no. 283465);
|
|
||||||
- iMarine(grant no. 283644);
|
|
||||||
- EUBrazilOpenBio (grant no. 288754).
|
|
||||||
- the H2020 research and innovation programme
|
|
||||||
- SoBigData (grant no. 654024);
|
|
||||||
- PARTHENOS (grant no. 654119);
|
|
||||||
- EGIEngage (grant no. 654142);
|
|
||||||
- ENVRIplus (grant no. 654182);
|
|
||||||
- BlueBRIDGE (grant no. 675680);
|
|
||||||
- PerformFish (grant no. 727610);
|
|
||||||
- AGINFRAplus (grant no. 731001);
|
|
||||||
- DESIRA (grant no. 818194);
|
|
||||||
- ARIADNEplus (grant no. 823914);
|
|
||||||
- RISIS2 (grant no. 824091);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,16 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
ACCEPTED_JAVA_VERSIONS=(11 17)
|
ACCEPTED_JAVA_VERSIONS=(11 17)
|
||||||
|
SMARTGEARS_VERSION=4.0.1-SNAPSHOT
|
||||||
|
|
||||||
|
JAVA_VERSION=11
|
||||||
|
TOMCAT_VERSION=10.1.19
|
||||||
|
PUSH_DOCKER=false
|
||||||
|
PUSH_HARBOR=false
|
||||||
|
LOGIN_HARBOR=false
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Help #
|
# Help #
|
||||||
|
@ -22,11 +32,9 @@ Help()
|
||||||
echo "-h Print this [h]elp."
|
echo "-h Print this [h]elp."
|
||||||
echo
|
echo
|
||||||
echo "to build a multiplatform image and push on d4science harbor"
|
echo "to build a multiplatform image and push on d4science harbor"
|
||||||
echo "./buid ./buildDistribution.sh -m -l -p"
|
echo " ./buildDistribution.sh -m -l -p"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
################################################################################
|
################################################################################
|
||||||
# Main program #
|
# Main program #
|
||||||
|
@ -34,15 +42,6 @@ Help()
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
SMARTGEARS_VERSION=4.0.0-SNAPSHOT
|
|
||||||
|
|
||||||
JAVA_VERSION=11
|
|
||||||
TOMCAT_VERSION=10.1.19
|
|
||||||
PUSH_DOCKER=false
|
|
||||||
PUSH_HARBOR=false
|
|
||||||
LOGIN_HARBOR=false
|
|
||||||
|
|
||||||
while getopts g:muplj:h flag
|
while getopts g:muplj:h flag
|
||||||
do
|
do
|
||||||
|
@ -74,15 +73,15 @@ if [ -z $GOAL ];
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z $MULTI_PLATFORM ];
|
if [ -z $MULTI_PLATFORM ];
|
||||||
then docker build -t $BUILD_NAME --build-arg JAVA_VERSION=${JAVA_VERSION} .;
|
then docker build -t $BUILD_NAME --build-arg="JAVA_VERSION=${JAVA_VERSION}" --build-arg="SMARTGEARS_VERSION=${SMARTGEARS_VERSION}" .;
|
||||||
else docker build -t $BUILD_NAME --build-arg JAVA_VERSION=${JAVA_VERSION} --platform=linux/amd64,linux/arm64,linux/arm/v7 . ;
|
else docker build -t $BUILD_NAME --build-arg="JAVA_VERSION=${JAVA_VERSION}" --build-arg="SMARTGEARS_VERSION=${SMARTGEARS_VERSION}" --platform=linux/amd64,linux/arm64,linux/arm/v7 . ;
|
||||||
echo ">>> generated docker image ${IMAGE_VERSION}"
|
echo ">>> generated docker image ${IMAGE_VERSION}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ ${PUSH_DOCKER} = true ];
|
if [ ${PUSH_DOCKER} = true ];
|
||||||
then
|
then
|
||||||
DOCKER_NAME = d4science/$BUILD_NAME
|
DOCKER_NAME=d4science/$BUILD_NAME
|
||||||
docker tag $BUILD_NAME $DOCKER_NAME;
|
docker tag $BUILD_NAME $DOCKER_NAME;
|
||||||
docker push $DOCKER_NAME;
|
docker push $DOCKER_NAME;
|
||||||
echo ">>> pushed on dockerhub the image $DOCKER_NAME"
|
echo ">>> pushed on dockerhub the image $DOCKER_NAME"
|
||||||
|
@ -97,6 +96,8 @@ fi
|
||||||
if [ ${PUSH_HARBOR} = true ];
|
if [ ${PUSH_HARBOR} = true ];
|
||||||
then
|
then
|
||||||
HARBOR_NAME=hub.dev.d4science.org/gcube/$BUILD_NAME
|
HARBOR_NAME=hub.dev.d4science.org/gcube/$BUILD_NAME
|
||||||
|
echo ">>> PUSHING on hub.dev.d4science.org the image $HARBOR_NAME"
|
||||||
|
|
||||||
docker tag $BUILD_NAME $HARBOR_NAME;
|
docker tag $BUILD_NAME $HARBOR_NAME;
|
||||||
docker push $HARBOR_NAME;
|
docker push $HARBOR_NAME;
|
||||||
echo ">>> pushed on hub.dev.d4science.org the image $HARBOR_NAME"
|
echo ">>> pushed on hub.dev.d4science.org the image $HARBOR_NAME"
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -9,7 +9,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.gcube.distribution</groupId>
|
<groupId>org.gcube.distribution</groupId>
|
||||||
<artifactId>smartgears-distribution</artifactId>
|
<artifactId>smartgears-distribution</artifactId>
|
||||||
<version>4.0.0-SNAPSHOT</version>
|
<version>4.0.1-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>A distribution for the SmartGears Framework</name>
|
<name>A distribution for the SmartGears Framework</name>
|
||||||
<properties>
|
<properties>
|
||||||
|
|
Loading…
Reference in New Issue