passato a versione 4.0.1 per indagare un conflitto
This commit is contained in:
parent
dcecfe224c
commit
b41aeaaf75
|
@ -2,6 +2,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for Smartgears Distribution
|
||||
|
||||
## [v4.0.1-SNAPSHOT] - 2022-03-30
|
||||
|
||||
- new version number
|
||||
|
||||
## [v4.0.0-SNAPSHOT] - 2022-03-30
|
||||
|
||||
- moving to smartgears-4.0.0
|
||||
|
|
|
@ -1,6 +1,16 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
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 #
|
||||
|
@ -22,11 +32,9 @@ Help()
|
|||
echo "-h Print this [h]elp."
|
||||
echo
|
||||
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 #
|
||||
|
@ -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
|
||||
do
|
||||
|
@ -74,15 +73,15 @@ if [ -z $GOAL ];
|
|||
fi
|
||||
|
||||
if [ -z $MULTI_PLATFORM ];
|
||||
then docker build -t $BUILD_NAME --build-arg JAVA_VERSION=${JAVA_VERSION} .;
|
||||
else docker build -t $BUILD_NAME --build-arg JAVA_VERSION=${JAVA_VERSION} --platform=linux/amd64,linux/arm64,linux/arm/v7 . ;
|
||||
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}" --build-arg="SMARTGEARS_VERSION=${SMARTGEARS_VERSION}" --platform=linux/amd64,linux/arm64,linux/arm/v7 . ;
|
||||
echo ">>> generated docker image ${IMAGE_VERSION}"
|
||||
fi
|
||||
|
||||
|
||||
if [ ${PUSH_DOCKER} = true ];
|
||||
then
|
||||
DOCKER_NAME = d4science/$BUILD_NAME
|
||||
DOCKER_NAME=d4science/$BUILD_NAME
|
||||
docker tag $BUILD_NAME $DOCKER_NAME;
|
||||
docker push $DOCKER_NAME;
|
||||
echo ">>> pushed on dockerhub the image $DOCKER_NAME"
|
||||
|
@ -97,6 +96,8 @@ fi
|
|||
if [ ${PUSH_HARBOR} = true ];
|
||||
then
|
||||
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 push $HARBOR_NAME;
|
||||
echo ">>> pushed on hub.dev.d4science.org the image $HARBOR_NAME"
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -9,7 +9,7 @@
|
|||
</parent>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>smartgears-distribution</artifactId>
|
||||
<version>4.0.0-SNAPSHOT</version>
|
||||
<version>4.0.1-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>A distribution for the SmartGears Framework</name>
|
||||
<properties>
|
||||
|
|
Loading…
Reference in New Issue