passato a versione 4.0.1 per indagare un conflitto
This commit is contained in:
parent
dcecfe224c
commit
d381f2bc30
|
@ -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
|
||||||
|
|
|
@ -1,6 +1,17 @@
|
||||||
#!/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
|
||||||
|
MULTI_PLATFORM=false
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Help #
|
# Help #
|
||||||
|
@ -22,11 +33,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 +43,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 +74,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 +97,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