diff --git a/build-app.sh b/build-app.sh index 03d9b987..93818a89 100755 --- a/build-app.sh +++ b/build-app.sh @@ -82,12 +82,14 @@ pushd $APP_FOLDER > /dev/null --env BP_JVM_VERSION=$v \ --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 \ --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dsun.jnu.encoding \ - --env BPE_APPEND_LC_ALL=en_US.utf8 \ - --env BPE_APPEND_LANG=en_US.utf8 \ + --env BPE_LC_ALL=en_US.utf8 \ + --env BPE_LANG=en_US.utf8 \ "springcloudstream/$app:$VERSION-jdk$v" + echo "Created:springcloudstream/$app:$VERSION-jdk$v" done if [ "$DEFAULT_JDK" == "" ]; then docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$VERSION" + echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$VERSION" fi done popd > /dev/null diff --git a/local/pack-containers.sh b/local/pack-containers.sh index b952666e..1cb45f17 100755 --- a/local/pack-containers.sh +++ b/local/pack-containers.sh @@ -81,8 +81,8 @@ for app in ${PROCESSORS[@]}; do --env BP_JVM_VERSION=$v \ --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 \ --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dsun.jnu.encoding \ - --env BPE_APPEND_LC_ALL=en_US.utf8 \ - --env BPE_APPEND_LANG=en_US.utf8 \ + --env BPE_LC_ALL=en_US.utf8 \ + --env BPE_LANG=en_US.utf8 \ "springcloudstream/$APP_NAME:$TAG" echo "Created springcloudstream/$APP_NAME:$TAG" else @@ -110,8 +110,8 @@ for app in ${SINKS[@]}; do --env BP_JVM_VERSION=$v \ --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 \ --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dsun.jnu.encoding \ - --env BPE_APPEND_LC_ALL=en_US.utf8 \ - --env BPE_APPEND_LANG=en_US.utf8 \ + --env BPE_LC_ALL=en_US.utf8 \ + --env BPE_LANG=en_US.utf8 \ "springcloudstream/$APP_NAME:$TAG" echo "Created springcloudstream/$APP_NAME:$TAG" else @@ -139,8 +139,8 @@ for app in ${SOURCES[@]}; do --env BP_JVM_VERSION=$v \ --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dfile.encoding=UTF-8 \ --env BPE_APPEND_JDK_JAVA_OPTIONS=-Dsun.jnu.encoding \ - --env BPE_APPEND_LC_ALL=en_US.utf8 \ - --env BPE_APPEND_LANG=en_US.utf8 \ + --env BPE_LC_ALL=en_US.utf8 \ + --env BPE_LANG=en_US.utf8 \ "springcloudstream/$APP_NAME:$TAG" echo "Created springcloudstream/$APP_NAME:$TAG" else diff --git a/publish-app.sh b/publish-app.sh index 5290a41a..8acc0378 100644 --- a/publish-app.sh +++ b/publish-app.sh @@ -48,8 +48,12 @@ pushd $APP_FOLDER > /dev/null project="$APP_FOLDER-$broker" docker tag "springcloudstream/$project:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$project:$VERSION" docker push "springcloudstream/$project:$VERSION-jdk$DEFAULT_JDK" + echo "Pushed:springcloudstream/$project:$VERSION-jdk$DEFAULT_JDK" + docker push "springcloudstream/$project:$VERSION" + echo "Pushed:springcloudstream/$project:$VERSION" for v in $JDKS; do docker push "springcloudstream/$project:$VERSION-jdk$v" + echo "Pushed:springcloudstream/$project:$VERSION-jdk$v" done done popd > /dev/null