Commit 3a582741 authored by Emmanuel Duchastenier's avatar Emmanuel Duchastenier
Browse files

Merge branch 'master' into 'dev'

parents b6780ac0 b8746009
...@@ -82,9 +82,9 @@ if [[ "$BUILD_ARGS" != *"BONITA_VERSION="* ]]; then ...@@ -82,9 +82,9 @@ if [[ "$BUILD_ARGS" != *"BONITA_VERSION="* ]]; then
BRANDING_VERSION=$(cat ../pom.xml | grep "<branding.version>" | sed -e 's/.*<branding.version>//g' -e 's/<\/branding.version>.*//g') BRANDING_VERSION=$(cat ../pom.xml | grep "<branding.version>" | sed -e 's/.*<branding.version>//g' -e 's/<\/branding.version>.*//g')
echo "Detected in pom file BONITA_VERSION=${BONITA_VERSION}" echo "Detected in pom file BONITA_VERSION=${BONITA_VERSION}"
echo "Detected in pom file BRANDING_VERSION=${BRANDING_VERSION}" echo "Detected in pom file BRANDING_VERSION=${BRANDING_VERSION}"
# If version is SNAPSHOT, we use it to build local image: # Check if we build a docker image from a local tomcat build:
if [[ "$BONITA_VERSION" == *"-SNAPSHOT"* ]]; then if ls ../tomcat/target/BonitaCommunity-*.zip 1> /dev/null 2>&1; then
echo "SNAPSHOT version detected: sending SHA256 and BONITA_VERSION as extra parameters" echo "Building from local tomcat: sending SHA256 and BONITA_VERSION as extra parameters"
BONITA_SHA256=$(sha256sum ./files/BonitaCommunity-*.zip | cut -d' ' -f1) BONITA_SHA256=$(sha256sum ./files/BonitaCommunity-*.zip | cut -d' ' -f1)
BUILD_ARGS="${BUILD_ARGS} --build-arg BONITA_VERSION=${BONITA_VERSION}" BUILD_ARGS="${BUILD_ARGS} --build-arg BONITA_VERSION=${BONITA_VERSION}"
BUILD_ARGS="${BUILD_ARGS} --build-arg BONITA_SHA256=${BONITA_SHA256}" BUILD_ARGS="${BUILD_ARGS} --build-arg BONITA_SHA256=${BONITA_SHA256}"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment