SpringCloud/stream-applications
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pushd / popd in app related scripts.

Browse Source
This commit is contained in:
Corneil du Plessis
2022-12-10 11:22:58 +02:00
parent 2e1d4b6cba
commit 4c6b99548d
2 changed files with 71 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
build-app.sh
View File

@@ -29,9 +29,9 @@ check_env ARTIFACTORY_USERNAME
check_env ARTIFACTORY_PASSWORD
pushd "$PROJECT_FOLDER" >/dev/null
if [ "$VERSION" == "" ]; then
VERSION=$($SCDIR/mvn-get-version.sh)
fi
if [ "$VERSION" == "" ]; then
VERSION=$($SCDIR/mvn-get-version.sh)
fi
popd >/dev/null
echo "Project Version:$VERSION"
if [ "$LOCAL" == "true" ]; then
@@ -53,53 +53,53 @@ else
fi
pushd "$APP_FOLDER" >/dev/null
rm -rf apps
echo "Deploying:$APP_FOLDER"
if [ -d "src/main/java" ]; then
rm -rf apps
echo "Deploying:$APP_FOLDER"
$SCDIR/build-folder.sh "." "$MAVEN_GOAL -Pintegration"
else
echo "Installing:$APP_FOLDER"
$SCDIR//build-folder.sh "." "clean install -Pintegration"
fi
if [ ! -d apps ]; then
echo "Cannot find $APP_FOLDER/apps"
exit 2
fi
pushd apps >/dev/null
APPS=$(find * -maxdepth 0 -type d)
for app in $APPS; do
echo "Removing jib-maven-plugin for:$APP_FOLDER/apps/$app"
$SCDIR/scripts/remove-jib-plugin.sh $app/pom.xml
done
for app in $APPS; do
pushd "$app" >/dev/null
FOLDER=$(pwd)
echo "Building:$FOLDER"
$SCDIR/build-folder.sh "." "$MAVEN_GOAL -Pintegration"
for v in $JDKS; do
echo "Pack:$app:$VERSION-jdk$v"
pack build \
--path "target/$app-$VERSION.jar" \
--builder gcr.io/paketo-buildpacks/builder:base \
--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_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"
if [ "$BRANCH" != "" ]; then
docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$BRANCH"
echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$BRANCH"
fi
if [ -d "src/main/java" ]; then
echo "Deploying:$APP_FOLDER"
$SCDIR/build-folder.sh "." "$MAVEN_GOAL -Pintegration"
else
echo "Installing:$APP_FOLDER"
$SCDIR//build-folder.sh "." "clean install -Pintegration"
fi
if [ ! -d apps ]; then
echo "Cannot find $APP_FOLDER/apps"
exit 2
fi
pushd apps >/dev/null
APPS=$(find * -maxdepth 0 -type d)
for app in $APPS; do
echo "Removing jib-maven-plugin for:$APP_FOLDER/apps/$app"
$SCDIR/scripts/remove-jib-plugin.sh $app/pom.xml
done
for app in $APPS; do
pushd "$app" >/dev/null
FOLDER=$(pwd)
echo "Building:$FOLDER"
$SCDIR/build-folder.sh "." "$MAVEN_GOAL -Pintegration"
for v in $JDKS; do
echo "Pack:$app:$VERSION-jdk$v"
pack build \
--path "target/$app-$VERSION.jar" \
--builder gcr.io/paketo-buildpacks/builder:base \
--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_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"
if [ "$BRANCH" != "" ]; then
docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$BRANCH"
echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$BRANCH"
fi
fi
popd >/dev/null
done
popd >/dev/null
done
popd >/dev/null
popd >/dev/null

45
publish-app.sh
View File

@@ -39,29 +39,28 @@ pushd "$PROJECT_FOLDER" > /dev/null
fi
JDKS="8 11 17"
fi
pushd "$APP_FOLDER" > /dev/null
pushd apps > /dev/null
echo "Pushing:$APP_FOLDER/apps"
APPS=$(find * -maxdepth 0 -type d)
for app in $APPS; do
set -e
docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$VERSION"
docker push "springcloudstream/$app:$VERSION"
echo "Pushed:springcloudstream/$app:$VERSION"
if [ "$BRANCH" != "" ]; then
docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$BRANCH"
echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$BRANCH"
docker push "springcloudstream/$app:$BRANCH"
fi
docker push "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK"
echo "Pushed:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK"
for v in $JDKS; do
docker push "springcloudstream/$app:$VERSION-jdk$v"
echo "Pushed:springcloudstream/$app:$VERSION-jdk$v"
done
set +e
popd > /dev/null
pushd "$APP_FOLDER" > /dev/null
pushd apps > /dev/null
echo "Pushing:$APP_FOLDER/apps"
APPS=$(find * -maxdepth 0 -type d)
for app in $APPS; do
set -e
docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$VERSION"
docker push "springcloudstream/$app:$VERSION"
echo "Pushed:springcloudstream/$app:$VERSION"
if [ "$BRANCH" != "" ]; then
docker tag "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK" "springcloudstream/$app:$BRANCH"
echo "Tagged:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK as springcloudstream/$app:$BRANCH"
docker push "springcloudstream/$app:$BRANCH"
fi
docker push "springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK"
echo "Pushed:springcloudstream/$app:$VERSION-jdk$DEFAULT_JDK"
for v in $JDKS; do
docker push "springcloudstream/$app:$VERSION-jdk$v"
echo "Pushed:springcloudstream/$app:$VERSION-jdk$v"
done
popd > /dev/null
set +e
done
popd > /dev/null
popd > /dev/null