From a8ba600be67f3e73e7373421c11da07bbd0c73b9 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 14:05:14 -0500 Subject: [PATCH 01/84] Create update.sh (investigating GitHub Actions) --- update.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 update.sh diff --git a/update.sh b/update.sh new file mode 100644 index 000000000..2b7443e3b --- /dev/null +++ b/update.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +echo "Hello from the update.sh script!" + +for file in $(find ./ga/investigateActions -type f); do + echo $file +done From 978d887223863398fc8be2f3216267c9ae8e938a Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 14:25:09 -0500 Subject: [PATCH 02/84] Yay more updates to update.sh --- update.sh | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index 2b7443e3b..d0c5c192d 100644 --- a/update.sh +++ b/update.sh @@ -2,6 +2,24 @@ echo "Hello from the update.sh script!" -for file in $(find ./ga/investigateActions -type f); do - echo $file +NEW_VERSION=23.0.0.66 +OLD_VERSION=23.0.0.11 + +echo "Copying latest files to $NEW_VERSION" +cp -r ./ga/latest ./ga/$NEW_VERSION + +# Perform the actual swaps by doing a search of the directory the script is running on +searchString="$OLD_VERSION" +for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); do + echo "Processing $file"; + + # Perform the swap for each version string/label/SHA in order + echo "--Performing subsitutions"; + sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; + + # Clean up temp files + echo "--Removing temp files" + rm $file.bak + + echo; done From 11267ba3f2d16f44ae219175311db089a8fbb67a Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 15:33:07 -0500 Subject: [PATCH 03/84] Update update.sh --- update.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index d0c5c192d..8b8b8604d 100644 --- a/update.sh +++ b/update.sh @@ -4,6 +4,8 @@ echo "Hello from the update.sh script!" NEW_VERSION=23.0.0.66 OLD_VERSION=23.0.0.11 +OLD_SHORT_VERSION=11 +BUILD_LABEL=12345_new echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION @@ -16,10 +18,24 @@ for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); # Perform the swap for each version string/label/SHA in order echo "--Performing subsitutions"; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; + sed -i'.bak' -e "s/LIBERTY_BUILD_LABEL=*/LIBERTY_BUILD_LABEL=$BUILD_LABEL" $file; + sed -i'.bak' -e "s#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:$NEW_VERSION-kernel#g" $file + sed -i'.bak' -e "s#FROM websphere-liberty:kernel#FROM websphere-liberty:$VERSION-kernel#g" $file # Clean up temp files echo "--Removing temp files" rm $file.bak - echo; + cp ga/$OLD_VERSION/images.txt ga/$NEW_VERSION/images.txt; + sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ga/$NEW_VERSION/images.txt; + rm ga/$NEW_VERSION/images.txt.bak; + + if [[ $(( $OLD_SHORT_VERSION % 3 )) -eq 0 ]] + then + : + else + rm -rf ga/$OLD_VERSION + fi + + echo "Done processing new file updates!"; done From 880f8e160618d63ab916e4c63e51bacbeeaafac1 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 15:39:11 -0500 Subject: [PATCH 04/84] Update update.sh --- update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update.sh b/update.sh index 8b8b8604d..b31de42ff 100644 --- a/update.sh +++ b/update.sh @@ -5,7 +5,7 @@ echo "Hello from the update.sh script!" NEW_VERSION=23.0.0.66 OLD_VERSION=23.0.0.11 OLD_SHORT_VERSION=11 -BUILD_LABEL=12345_new +BUILD_LABEL=12345 echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION @@ -19,8 +19,8 @@ for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); echo "--Performing subsitutions"; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; sed -i'.bak' -e "s/LIBERTY_BUILD_LABEL=*/LIBERTY_BUILD_LABEL=$BUILD_LABEL" $file; - sed -i'.bak' -e "s#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:$NEW_VERSION-kernel#g" $file - sed -i'.bak' -e "s#FROM websphere-liberty:kernel#FROM websphere-liberty:$VERSION-kernel#g" $file + sed -i'.bak' -e "s#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:$NEW_VERSION-kernel#g" $file; + sed -i'.bak' -e "s#FROM websphere-liberty:kernel#FROM websphere-liberty:$NEW_VERSION-kernel#g" $file; # Clean up temp files echo "--Removing temp files" From 436908edf535a6ea4ec12196b7a469772308978c Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 15:48:03 -0500 Subject: [PATCH 05/84] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index b31de42ff..8746afabf 100644 --- a/update.sh +++ b/update.sh @@ -18,7 +18,7 @@ for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); # Perform the swap for each version string/label/SHA in order echo "--Performing subsitutions"; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; - sed -i'.bak' -e "s/LIBERTY_BUILD_LABEL=*/LIBERTY_BUILD_LABEL=$BUILD_LABEL" $file; + sed -i'.bak' -e "s/LIBERTY_BUILD_LABEL=*/LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; sed -i'.bak' -e "s#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:$NEW_VERSION-kernel#g" $file; sed -i'.bak' -e "s#FROM websphere-liberty:kernel#FROM websphere-liberty:$NEW_VERSION-kernel#g" $file; From ca29f1cf12139da76daeb7323c4c3b4c8c5af040 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 15:49:51 -0500 Subject: [PATCH 06/84] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 8746afabf..13c47407f 100644 --- a/update.sh +++ b/update.sh @@ -18,7 +18,7 @@ for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); # Perform the swap for each version string/label/SHA in order echo "--Performing subsitutions"; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; - sed -i'.bak' -e "s/LIBERTY_BUILD_LABEL=*/LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; + sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; sed -i'.bak' -e "s#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:$NEW_VERSION-kernel#g" $file; sed -i'.bak' -e "s#FROM websphere-liberty:kernel#FROM websphere-liberty:$NEW_VERSION-kernel#g" $file; From c3972af02c1492c3f256633734f90d2500826871 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 15:58:16 -0500 Subject: [PATCH 07/84] Update update.sh --- update.sh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/update.sh b/update.sh index 13c47407f..1c8921674 100644 --- a/update.sh +++ b/update.sh @@ -1,6 +1,7 @@ #!/bin/bash echo "Hello from the update.sh script!" +echo "The latest version is really being invoked. :\ " NEW_VERSION=23.0.0.66 OLD_VERSION=23.0.0.11 @@ -26,16 +27,17 @@ for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); echo "--Removing temp files" rm $file.bak - cp ga/$OLD_VERSION/images.txt ga/$NEW_VERSION/images.txt; - sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ga/$NEW_VERSION/images.txt; - rm ga/$NEW_VERSION/images.txt.bak; +done - if [[ $(( $OLD_SHORT_VERSION % 3 )) -eq 0 ]] - then - : - else - rm -rf ga/$OLD_VERSION - fi +cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt; +sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt; +rm ./ga/$NEW_VERSION/images.txt.bak; - echo "Done processing new file updates!"; -done +if [[ $(( $OLD_SHORT_VERSION % 3 )) -eq 0 ]] + then + : + else + rm -rf ./ga/$OLD_VERSION + fi + +echo "Done processing new file updates!"; From 4f69e4829ab2312b06b49e90c09e1d239ce1fdb7 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 16:09:56 -0500 Subject: [PATCH 08/84] Glob corrections --- update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update.sh b/update.sh index 1c8921674..de24673ce 100644 --- a/update.sh +++ b/update.sh @@ -19,9 +19,9 @@ for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); # Perform the swap for each version string/label/SHA in order echo "--Performing subsitutions"; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; - sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; - sed -i'.bak' -e "s#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel#ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:$NEW_VERSION-kernel#g" $file; - sed -i'.bak' -e "s#FROM websphere-liberty:kernel#FROM websphere-liberty:$NEW_VERSION-kernel#g" $file; + sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; + sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; + sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; # Clean up temp files echo "--Removing temp files" From d1be9ac5007378d911b713d9a7af5c183a265c45 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 16:14:55 -0500 Subject: [PATCH 09/84] Update update.sh --- update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index de24673ce..93cd19ab7 100644 --- a/update.sh +++ b/update.sh @@ -13,7 +13,8 @@ cp -r ./ga/latest ./ga/$NEW_VERSION # Perform the actual swaps by doing a search of the directory the script is running on searchString="$OLD_VERSION" -for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); do +#for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); do +for file in $(find ./ga/$NEW_VERSION -name Dockerfile.*) echo "Processing $file"; # Perform the swap for each version string/label/SHA in order From e473865e185631ce7a31160be41a621cdc1a20f4 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 16:16:42 -0500 Subject: [PATCH 10/84] for loop syntax error --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 93cd19ab7..86450ce11 100644 --- a/update.sh +++ b/update.sh @@ -14,7 +14,7 @@ cp -r ./ga/latest ./ga/$NEW_VERSION # Perform the actual swaps by doing a search of the directory the script is running on searchString="$OLD_VERSION" #for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); do -for file in $(find ./ga/$NEW_VERSION -name Dockerfile.*) +for file in $(find ./ga/$NEW_VERSION -name Dockerfile.*); do echo "Processing $file"; # Perform the swap for each version string/label/SHA in order From d7b6aed460ab0f9748076ef725264ec66c8af14b Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 16:33:59 -0500 Subject: [PATCH 11/84] Add timestamp debug, cleanup --- update.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/update.sh b/update.sh index 86450ce11..926bda0fb 100644 --- a/update.sh +++ b/update.sh @@ -1,7 +1,7 @@ #!/bin/bash echo "Hello from the update.sh script!" -echo "The latest version is really being invoked. :\ " +echo $(date) NEW_VERSION=23.0.0.66 OLD_VERSION=23.0.0.11 @@ -12,8 +12,6 @@ echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION # Perform the actual swaps by doing a search of the directory the script is running on -searchString="$OLD_VERSION" -#for file in $(find ./ga/$NEW_VERSION -type f | xargs egrep -l "$searchString"); do for file in $(find ./ga/$NEW_VERSION -name Dockerfile.*); do echo "Processing $file"; From 1f0eb8c791d9c6f13fd1f2ddc73ccbad2bae4abe Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 25 Oct 2023 16:37:47 -0500 Subject: [PATCH 12/84] Remove cluttery debug --- update.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/update.sh b/update.sh index 926bda0fb..b75c36bc0 100644 --- a/update.sh +++ b/update.sh @@ -11,19 +11,17 @@ BUILD_LABEL=12345 echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION -# Perform the actual swaps by doing a search of the directory the script is running on +# Perform the substitutions by searching in newly created directory for file in $(find ./ga/$NEW_VERSION -name Dockerfile.*); do echo "Processing $file"; # Perform the swap for each version string/label/SHA in order - echo "--Performing subsitutions"; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; # Clean up temp files - echo "--Removing temp files" rm $file.bak done From 544a1895ee81ca809f1e16c772c6e1749630da76 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 09:40:52 -0500 Subject: [PATCH 13/84] Create vNext.properties --- vNext.properties | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 vNext.properties diff --git a/vNext.properties b/vNext.properties new file mode 100644 index 000000000..69c1cb133 --- /dev/null +++ b/vNext.properties @@ -0,0 +1,5 @@ +# Properties read by the script file updating files for new release +OLD_VERSION=23.0.0.11 +NEW_VERSION=23.0.0.73 +OLD_SHORT_VERSION=11 +BUILD_LABEL=cl231026231234-1234 From f071b7a05ebdf1af7754d1565089949df0d8f250 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 09:42:55 -0500 Subject: [PATCH 14/84] Use properties file --- update.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/update.sh b/update.sh index b75c36bc0..54898b484 100644 --- a/update.sh +++ b/update.sh @@ -3,10 +3,7 @@ echo "Hello from the update.sh script!" echo $(date) -NEW_VERSION=23.0.0.66 -OLD_VERSION=23.0.0.11 -OLD_SHORT_VERSION=11 -BUILD_LABEL=12345 +. ~/vNext.properties echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION From dff876646322f56e431443ebdca447dbdfd64943 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 09:44:04 -0500 Subject: [PATCH 15/84] Update vNext.properties --- vNext.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vNext.properties b/vNext.properties index 69c1cb133..f23573cd3 100644 --- a/vNext.properties +++ b/vNext.properties @@ -3,3 +3,5 @@ OLD_VERSION=23.0.0.11 NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 + +# Update! From ea2b5ee7ff8a56a167547699e1b6df73d8322254 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 09:46:50 -0500 Subject: [PATCH 16/84] Create updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 59 +++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/updateFilesForRelease.yml diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml new file mode 100644 index 000000000..d04954d9d --- /dev/null +++ b/.github/workflows/updateFilesForRelease.yml @@ -0,0 +1,59 @@ +# This is a basic workflow that is triggered by a push + +name: Update files for new release workflow + +# Controls when the action will run. Workflow runs when manually triggered using the UI +# or API. +on: + push: + branches: + - vNext + paths: + - 'vNext.properties' + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called + automate_release_updates: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + - name: Show useful information about the environment + run: | + echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + + - name: Check out repository code + uses: actions/checkout@v4 + with: + ref: vNext + repository: wraschke/ci.docker + + - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." + + - name: List files in the repository + run: | + ls ${{ github.workspace }} + + - name: Run update.sh script + run: bash ./update.sh + + - name: Commit changes + uses: EndBug/add-and-commit@v9 + with: + default_author: github_actions + author_name: GitHub Actions + author_email: mail@example.com + message: 'Test commit' + add: '${{ github.workspace }}/ga/*' + new_branch: test_branch + push: true + tag_push: '--force' + + - name: Create Pull Request + run: gh pr create -B vNext -H test_branch -r mbroz2 -r leochr --title 'Updates for the new release' --body 'Created by Github Actions' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - run: echo "🍏 This job's status is ${{ job.status }}." From 3dc8ce667663115b635d8e1f39cc2efdb8c9f424 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 09:47:53 -0500 Subject: [PATCH 17/84] Update vNext.properties --- vNext.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index f23573cd3..1e593ae07 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,3 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! From 1ad532e9e5ee43900ef5f42af1aa8eb5f661a369 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 09:51:31 -0500 Subject: [PATCH 18/84] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 54898b484..9dd3af08e 100644 --- a/update.sh +++ b/update.sh @@ -3,7 +3,7 @@ echo "Hello from the update.sh script!" echo $(date) -. ~/vNext.properties +. ./vNext.properties echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION From b0cef778971ad99fd4682f4f626c9f6e791bbc8a Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 09:52:51 -0500 Subject: [PATCH 19/84] Update vNext.properties --- vNext.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/vNext.properties b/vNext.properties index 1e593ae07..f23573cd3 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,3 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 +# Update! From 926f96102036b867ebd976cfbf1a388042d448b9 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 09:54:17 -0500 Subject: [PATCH 20/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index f23573cd3..a5d76e413 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! +# Update! 9:54 AM From 8b815b1a920fc3ff2e92735e14f486b6a438834c Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:21:45 -0500 Subject: [PATCH 21/84] Update update.sh --- update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/update.sh b/update.sh index 9dd3af08e..917491488 100644 --- a/update.sh +++ b/update.sh @@ -5,6 +5,9 @@ echo $(date) . ./vNext.properties +# Try to propagate this to the workflow environment? +export NEW_VERSION=$NEW_VERSION; + echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION From 1962cad3065c9437b05fce16fdb0de10d1e9058c Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:24:11 -0500 Subject: [PATCH 22/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index d04954d9d..0d9dc1ec9 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -39,6 +39,8 @@ jobs: - name: Run update.sh script run: bash ./update.sh + - run: echo "$NEW_VERSION" + - name: Commit changes uses: EndBug/add-and-commit@v9 with: From bf1b68d5b4b7d77195f5ff1e0efc780485d151b9 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:24:22 -0500 Subject: [PATCH 23/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index a5d76e413..e33eef0f9 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 9:54 AM +# Update! 10:24 AM From 33c679e671a599c9c0bea36429b9c0d443ff0cca Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:33:31 -0500 Subject: [PATCH 24/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 0d9dc1ec9..7c5963de2 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -17,12 +17,15 @@ jobs: automate_release_updates: # The type of runner that the job will run on runs-on: ubuntu-latest + env: + NEW_VERSION: 23.0.0.73 # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: Show useful information about the environment run: | - echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository + echo "NEW_VERSION: $NEW_VERSION" - name: Check out repository code uses: actions/checkout@v4 @@ -32,29 +35,28 @@ jobs: - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." - - name: List files in the repository - run: | - ls ${{ github.workspace }} + # Uncomment out if you need to debug + # - name: List files in the repository + # run: | + # ls ${{ github.workspace }} - name: Run update.sh script run: bash ./update.sh - - run: echo "$NEW_VERSION" - - name: Commit changes uses: EndBug/add-and-commit@v9 with: default_author: github_actions author_name: GitHub Actions author_email: mail@example.com - message: 'Test commit' + message: "Updates for the release of $NEW_VERSION" add: '${{ github.workspace }}/ga/*' - new_branch: test_branch + new_branch: $NEW_VERSION-release push: true tag_push: '--force' - name: Create Pull Request - run: gh pr create -B vNext -H test_branch -r mbroz2 -r leochr --title 'Updates for the new release' --body 'Created by Github Actions' + run: gh pr create -B vNext -H $NEW_VERSION-release -r mbroz2 -r leochr --title "Updates for the release of $$NEW_VERSION" --body "Created by Github Actions" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 622320524e780f6e471eb108cca39315a4fe81e7 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:33:49 -0500 Subject: [PATCH 25/84] Update update.sh --- update.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/update.sh b/update.sh index 917491488..9dd3af08e 100644 --- a/update.sh +++ b/update.sh @@ -5,9 +5,6 @@ echo $(date) . ./vNext.properties -# Try to propagate this to the workflow environment? -export NEW_VERSION=$NEW_VERSION; - echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION From 697343e24c74771f1f4230c88c706d0f611fd261 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:33:59 -0500 Subject: [PATCH 26/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index e33eef0f9..57f6fb736 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 10:24 AM +# Update! 10:33 AM From ca1f6dd9f6b7ebdf28b1d3bc0f9b44b353ad218f Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:37:49 -0500 Subject: [PATCH 27/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 7c5963de2..f0649ec9a 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Show useful information about the environment run: | - echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository + echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." echo "NEW_VERSION: $NEW_VERSION" - name: Check out repository code From ca14668a2f1af9a8c6cc53a1ffcfcdc76742bfc2 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:39:04 -0500 Subject: [PATCH 28/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 57f6fb736..53fef088f 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 10:33 AM +# Update! 10:38 AM From cd1765ec5701add1b8eb03d5727cc662f9230df4 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:42:35 -0500 Subject: [PATCH 29/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index f0649ec9a..f2a1a8b5d 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -51,12 +51,12 @@ jobs: author_email: mail@example.com message: "Updates for the release of $NEW_VERSION" add: '${{ github.workspace }}/ga/*' - new_branch: $NEW_VERSION-release + new_branch: "$NEW_VERSION-release" push: true tag_push: '--force' - name: Create Pull Request - run: gh pr create -B vNext -H $NEW_VERSION-release -r mbroz2 -r leochr --title "Updates for the release of $$NEW_VERSION" --body "Created by Github Actions" + run: gh pr create -B vNext -H "$NEW_VERSION-release" -r mbroz2 -r leochr --title "Updates for the release of $NEW_VERSION" --body "Created by Github Actions" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 4432a085550f5291c203b2ad6f0fc59fe26423ea Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:43:39 -0500 Subject: [PATCH 30/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 53fef088f..8feed9bd2 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 10:38 AM +# Update! 10:43 AM From 0c2aaba8acfb938a29cd6b869d359f91c510f521 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:57:54 -0500 Subject: [PATCH 31/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index f2a1a8b5d..2366a8171 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -11,21 +11,21 @@ on: paths: - 'vNext.properties' +env: + NEW_VERSION: 23.0.0.73 + # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called automate_release_updates: # The type of runner that the job will run on runs-on: ubuntu-latest - env: - NEW_VERSION: 23.0.0.73 # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: Show useful information about the environment run: | echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - echo "NEW_VERSION: $NEW_VERSION" - name: Check out repository code uses: actions/checkout@v4 @@ -35,14 +35,11 @@ jobs: - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." - # Uncomment out if you need to debug - # - name: List files in the repository - # run: | - # ls ${{ github.workspace }} - - name: Run update.sh script run: bash ./update.sh + - run: echo "NEW_VERSION = $NEW_VERSION" + - name: Commit changes uses: EndBug/add-and-commit@v9 with: @@ -56,7 +53,9 @@ jobs: tag_push: '--force' - name: Create Pull Request - run: gh pr create -B vNext -H "$NEW_VERSION-release" -r mbroz2 -r leochr --title "Updates for the release of $NEW_VERSION" --body "Created by Github Actions" + run: | + echo "NEW_VERSION = $NEW_VERSION" + gh pr create -B vNext -H "$NEW_VERSION-release" -r mbroz2 -r leochr --title "Updates for the release of $NEW_VERSION" --body "Created by Github Actions" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ebd9db8058e9991a8079524a408e7c8423b07850 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 10:58:04 -0500 Subject: [PATCH 32/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 8feed9bd2..31876e2b4 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 10:43 AM +# Update! 10:58 AM From 085fbe2f7f1a2e1ffcd35c8c018615a060dc9bca Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:19:01 -0500 Subject: [PATCH 33/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 2366a8171..20a22dded 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -54,6 +54,7 @@ jobs: - name: Create Pull Request run: | + gh variable set NEW_VERSION < vNext.properties echo "NEW_VERSION = $NEW_VERSION" gh pr create -B vNext -H "$NEW_VERSION-release" -r mbroz2 -r leochr --title "Updates for the release of $NEW_VERSION" --body "Created by Github Actions" env: From 47d6e8a21f43f760c941334141ba9a7bf66d6495 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:19:20 -0500 Subject: [PATCH 34/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 31876e2b4..29deae5df 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 10:58 AM +# Update! 11:19 AM From 8e104c3d21d470299bab4eef66b7feca35820158 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:21:49 -0500 Subject: [PATCH 35/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 20a22dded..f7a3c9c09 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -54,7 +54,7 @@ jobs: - name: Create Pull Request run: | - gh variable set NEW_VERSION < vNext.properties + gh variable set NEW_VERSION --body "$NEW_VERSION" echo "NEW_VERSION = $NEW_VERSION" gh pr create -B vNext -H "$NEW_VERSION-release" -r mbroz2 -r leochr --title "Updates for the release of $NEW_VERSION" --body "Created by Github Actions" env: From 81ad8898c961085124bac701812ccce29cec7d09 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:22:01 -0500 Subject: [PATCH 36/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 29deae5df..e2b27d2af 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 11:19 AM +# Update! 11:21 AM From a6faee4469a829fec73c7815e430c13ddf3b77d1 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:26:19 -0500 Subject: [PATCH 37/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index f7a3c9c09..6eaaa6fc6 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -20,6 +20,8 @@ jobs: automate_release_updates: # The type of runner that the job will run on runs-on: ubuntu-latest + permissions: + contents: write # Steps represent a sequence of tasks that will be executed as part of the job steps: From 8c20686ff4926234a26c61167cde0d9f12833268 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:26:31 -0500 Subject: [PATCH 38/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index e2b27d2af..93829ece0 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 11:21 AM +# Update! 11:26 AM From d8d95bc8acfc24b1c24461a73bfef2feaae59975 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:32:33 -0500 Subject: [PATCH 39/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 6eaaa6fc6..93475b11d 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -2,8 +2,6 @@ name: Update files for new release workflow -# Controls when the action will run. Workflow runs when manually triggered using the UI -# or API. on: push: branches: @@ -14,16 +12,12 @@ on: env: NEW_VERSION: 23.0.0.73 -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called automate_release_updates: - # The type of runner that the job will run on runs-on: ubuntu-latest permissions: - contents: write + actions: write - # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: Show useful information about the environment run: | From 3fb74289da885870659605dd4eceff50ee84b7e7 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:32:43 -0500 Subject: [PATCH 40/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 93829ece0..59e9cbdb5 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 11:26 AM +# Update! 11:32 AM From 3e694d6a16857a8a37ecbb4936c1298b728a02e7 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:34:04 -0500 Subject: [PATCH 41/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 93475b11d..2247047c9 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -17,6 +17,8 @@ jobs: runs-on: ubuntu-latest permissions: actions: write + contents: write + pull-requests: write steps: - name: Show useful information about the environment From ffa5afc9be86647e9750aeb3c4eaf159ce8fc6c7 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:34:13 -0500 Subject: [PATCH 42/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 59e9cbdb5..25f96fb60 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 11:32 AM +# Update! 11:34 AM From 4642bdbce5b274e7b33820db4c5894a0dffe91c0 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:35:36 -0500 Subject: [PATCH 43/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 2247047c9..87ac18787 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -9,8 +9,8 @@ on: paths: - 'vNext.properties' -env: - NEW_VERSION: 23.0.0.73 +#env: +# NEW_VERSION: 23.0.0.73 jobs: automate_release_updates: From ca4cbf656211011cf82dbdd496165df68e4f75d9 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:35:57 -0500 Subject: [PATCH 44/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 25f96fb60..d0510339e 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 11:34 AM +# Update! 11:35 AM From 85c99b1186ee540fb7595582e05baf9b54ef49de Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:37:16 -0500 Subject: [PATCH 45/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 87ac18787..32d7e9247 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -9,8 +9,8 @@ on: paths: - 'vNext.properties' -#env: -# NEW_VERSION: 23.0.0.73 +env: + NEW_VERSION: 23.0.0.73 jobs: automate_release_updates: @@ -24,6 +24,7 @@ jobs: - name: Show useful information about the environment run: | echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + env - name: Check out repository code uses: actions/checkout@v4 From be718d0734ed891ee3053f05b44d48e2c0ae5bb2 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:37:36 -0500 Subject: [PATCH 46/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 32d7e9247..01cb9d992 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -15,10 +15,6 @@ env: jobs: automate_release_updates: runs-on: ubuntu-latest - permissions: - actions: write - contents: write - pull-requests: write steps: - name: Show useful information about the environment From 776bf213cd9a16a99c9abf82fa144f91ae8f2069 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:37:53 -0500 Subject: [PATCH 47/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index d0510339e..166924b6e 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 11:35 AM +# Update! 11:37 AM From ca5166e44e6a0255f3d08f3c0e008f65043a452f Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:45:37 -0500 Subject: [PATCH 48/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 01cb9d992..4c6f48462 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -33,7 +33,7 @@ jobs: - name: Run update.sh script run: bash ./update.sh - - run: echo "NEW_VERSION = $NEW_VERSION" + - run: echo "NEW_VERSION = ${{ env.NEW_VERSION }}" - name: Commit changes uses: EndBug/add-and-commit@v9 @@ -41,17 +41,16 @@ jobs: default_author: github_actions author_name: GitHub Actions author_email: mail@example.com - message: "Updates for the release of $NEW_VERSION" + message: "Updates for the release of ${{ env.NEW_VERSION }}" add: '${{ github.workspace }}/ga/*' - new_branch: "$NEW_VERSION-release" + new_branch: "${{ env.NEW_VERSION }}-release" push: true tag_push: '--force' - name: Create Pull Request run: | - gh variable set NEW_VERSION --body "$NEW_VERSION" - echo "NEW_VERSION = $NEW_VERSION" - gh pr create -B vNext -H "$NEW_VERSION-release" -r mbroz2 -r leochr --title "Updates for the release of $NEW_VERSION" --body "Created by Github Actions" + echo "NEW_VERSION = ${{ env.NEW_VERSION }}" + gh pr create -B vNext -H "${{ env.NEW_VERSION }}-release" -r mbroz2 -r leochr --title "Updates for the release of ${{ env.NEW_VERSION }}" --body "Created by Github Actions" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 2f2a2c66525372312059a44f236d1dab99ddc00a Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 11:45:47 -0500 Subject: [PATCH 49/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 166924b6e..b09bbe1fa 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 11:37 AM +# Update! 11:45 AM From 4bbe313d0d091d454f2e999a2dbdd7d4ea7ba5cf Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:07:35 -0500 Subject: [PATCH 50/84] Update update.sh --- update.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/update.sh b/update.sh index 9dd3af08e..7e85cbf37 100644 --- a/update.sh +++ b/update.sh @@ -9,17 +9,24 @@ echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION # Perform the substitutions by searching in newly created directory -for file in $(find ./ga/$NEW_VERSION -name Dockerfile.*); do +searchString="$OLD_VERSION|$BUILD_LABEL"; +echo "searchString: $searchString" +for file in $(find ./ga -type f | xargs egrep -l "$searchString"); do +#for file in $(find ./ga/$NEW_VERSION -name Dockerfile.*); do echo "Processing $file"; - # Perform the swap for each version string/label/SHA in order sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; - sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; - sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; - # Clean up temp files - rm $file.bak + # Don't do this substitution in latest directory + if [[ "$folder" == ga/NEW_VERSION/* ]]; + then + sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; + sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; + fi + + # Clean up temp files + rm $file.bak done From f047d02989a5e9e83d5ae77018656321350d6930 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:08:10 -0500 Subject: [PATCH 51/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index b09bbe1fa..720270b75 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 11:45 AM +# Update! 12:08 PM From 889e5f7d036c583227a67f8b864d2e80d4ef887c Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:20:42 -0500 Subject: [PATCH 52/84] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 7e85cbf37..6f6c6cc10 100644 --- a/update.sh +++ b/update.sh @@ -19,7 +19,7 @@ for file in $(find ./ga -type f | xargs egrep -l "$searchString"); do sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; # Don't do this substitution in latest directory - if [[ "$folder" == ga/NEW_VERSION/* ]]; + if [[ "$folder" == ga/$NEW_VERSION/* ]]; then sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; From 1787299a93828513c4754642ea9d053532507147 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:21:06 -0500 Subject: [PATCH 53/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 720270b75..ba1e97573 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 12:08 PM +# Update! 12:21 PM From f49d645185659c03ca4e85f440dbe84e5af04957 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:24:47 -0500 Subject: [PATCH 54/84] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 6f6c6cc10..77aa5432c 100644 --- a/update.sh +++ b/update.sh @@ -19,7 +19,7 @@ for file in $(find ./ga -type f | xargs egrep -l "$searchString"); do sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; # Don't do this substitution in latest directory - if [[ "$folder" == ga/$NEW_VERSION/* ]]; + if [[ "$folder" == "ga/$NEW_VERSION/"* ]]; then sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; From ca940d33954f0d8d6eeb0585c39fbc80d040ce67 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:25:15 -0500 Subject: [PATCH 55/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index ba1e97573..094eabfad 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 12:21 PM +# Update! 12:25 PM From 95307096996bb9082a9114f27a344ed3718d25d7 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:27:06 -0500 Subject: [PATCH 56/84] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 77aa5432c..edd5bdc08 100644 --- a/update.sh +++ b/update.sh @@ -19,7 +19,7 @@ for file in $(find ./ga -type f | xargs egrep -l "$searchString"); do sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; # Don't do this substitution in latest directory - if [[ "$folder" == "ga/$NEW_VERSION/"* ]]; + if [[ "$file" == "ga/$NEW_VERSION/"* ]]; then sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; From 9015c13b2c669a28b9042d47a0b83e9d3a61136a Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:27:19 -0500 Subject: [PATCH 57/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 094eabfad..ab0080025 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 12:25 PM +# Update! 12:27 PM From 9c922fd860bc611cf7b8056764268ee493c06bbb Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:35:53 -0500 Subject: [PATCH 58/84] Update update.sh --- update.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index edd5bdc08..e3142db72 100644 --- a/update.sh +++ b/update.sh @@ -18,9 +18,10 @@ for file in $(find ./ga -type f | xargs egrep -l "$searchString"); do sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; - # Don't do this substitution in latest directory - if [[ "$file" == "ga/$NEW_VERSION/"* ]]; + # Do this substitution only in new release directory + if [[ "$file" == "./ga/$NEW_VERSION/"* ]]; then + echo "In the parent_image flow, yay" sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; fi From 53905e8d9b29b8292c9ab680075f241902881d44 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:36:18 -0500 Subject: [PATCH 59/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index ab0080025..a75d2a10d 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 12:27 PM +# Update! 12:36 PM From efc3501b78b0e4a64043ee1f980a932c5d9b3001 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:46:01 -0500 Subject: [PATCH 60/84] Update update.sh --- update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/update.sh b/update.sh index e3142db72..c9b9af5e0 100644 --- a/update.sh +++ b/update.sh @@ -11,8 +11,8 @@ cp -r ./ga/latest ./ga/$NEW_VERSION # Perform the substitutions by searching in newly created directory searchString="$OLD_VERSION|$BUILD_LABEL"; echo "searchString: $searchString" -for file in $(find ./ga -type f | xargs egrep -l "$searchString"); do -#for file in $(find ./ga/$NEW_VERSION -name Dockerfile.*); do +#for file in $(find ./ga -type f | xargs egrep -l "$searchString"); do +for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do echo "Processing $file"; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; From 78d0c855f331e520ea94f2133e93cc9a7fa9fad5 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:46:12 -0500 Subject: [PATCH 61/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index a75d2a10d..2840ae786 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 12:36 PM +# Update! 12:46 PM From 2a70dab60d51bc7bb3046746ad812c2501978e61 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:47:14 -0500 Subject: [PATCH 62/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 2840ae786..29b356639 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 12:46 PM +# Update! 12:47 PM From 43382b2ddc3094410efbc52ef23ba20cb7d35779 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:50:25 -0500 Subject: [PATCH 63/84] Update update.sh --- update.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/update.sh b/update.sh index c9b9af5e0..d20cd48f2 100644 --- a/update.sh +++ b/update.sh @@ -9,9 +9,6 @@ echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION # Perform the substitutions by searching in newly created directory -searchString="$OLD_VERSION|$BUILD_LABEL"; -echo "searchString: $searchString" -#for file in $(find ./ga -type f | xargs egrep -l "$searchString"); do for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do echo "Processing $file"; @@ -21,7 +18,6 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do # Do this substitution only in new release directory if [[ "$file" == "./ga/$NEW_VERSION/"* ]]; then - echo "In the parent_image flow, yay" sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; fi From 64f89d8813a13900d092625f1f274e9e09cea10c Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:50:44 -0500 Subject: [PATCH 64/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index 29b356639..fafb248c3 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 12:47 PM +# Update! 12:50 PM From fe61d06342409db865e87696986e842d81be7b83 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 12:51:36 -0500 Subject: [PATCH 65/84] Update vNext.properties --- vNext.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vNext.properties b/vNext.properties index fafb248c3..f955f70d7 100644 --- a/vNext.properties +++ b/vNext.properties @@ -4,4 +4,4 @@ NEW_VERSION=23.0.0.73 OLD_SHORT_VERSION=11 BUILD_LABEL=cl231026231234-1234 -# Update! 12:50 PM +# Update! 12:51 PM From f1fa06aee80ddac6dc6989d94c37b4ed830c70a8 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 17:57:20 -0500 Subject: [PATCH 66/84] Create manual.yml --- .github/workflows/manual.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/manual.yml diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml new file mode 100644 index 000000000..11b2e3558 --- /dev/null +++ b/.github/workflows/manual.yml @@ -0,0 +1,32 @@ +# This is a basic workflow that is manually triggered + +name: Manual workflow + +# Controls when the action will run. Workflow runs when manually triggered using the UI +# or API. +on: + workflow_dispatch: + # Inputs the workflow accepts. + inputs: + name: + # Friendly description to be shown in the UI instead of 'name' + description: 'Person to greet' + # Default value if no value is explicitly provided + default: 'World' + # Input has to be provided for the workflow to run + required: true + # The data type of the input + type: string + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "greet" + greet: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Runs a single command using the runners shell + - name: Send greeting + run: echo "Hello ${{ inputs.name }}" From b387fedb0051f7b83dc4feb2bc5dac41e9ca5bc0 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 18:34:55 -0500 Subject: [PATCH 67/84] Update manual.yml --- .github/workflows/manual.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 11b2e3558..1de5cc03a 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -8,15 +8,29 @@ on: workflow_dispatch: # Inputs the workflow accepts. inputs: - name: - # Friendly description to be shown in the UI instead of 'name' - description: 'Person to greet' + OLD_VERSION: + description: 'Enter old version' # Default value if no value is explicitly provided - default: 'World' + default: '23.0.0.11' # Input has to be provided for the workflow to run required: true # The data type of the input type: string + NEW_VERSION: + description: 'Enter new version' + default: '23.0.0.12' + required: true + type: string + OLD_SHORT_VERSION: + description: 'Enter single digit of old version' + default: '11' + required: true + type: string + BUILD_LABEL: + description: 'Enter build label of release driver' + default: '' + required: true + type: string # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: From 0ef87f4b8280719ff847b90de11ae4b39795cf0c Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 18:35:23 -0500 Subject: [PATCH 68/84] Update manual.yml --- .github/workflows/manual.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 1de5cc03a..49dfa2c42 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -1,6 +1,6 @@ # This is a basic workflow that is manually triggered -name: Manual workflow +name: vNext manual workflow # Controls when the action will run. Workflow runs when manually triggered using the UI # or API. From d2190d3d5967810c3e99992f8ab42285d22efd7e Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Thu, 26 Oct 2023 18:37:04 -0500 Subject: [PATCH 69/84] Update manual.yml --- .github/workflows/manual.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 49dfa2c42..1d0cc4857 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -43,4 +43,8 @@ jobs: steps: # Runs a single command using the runners shell - name: Send greeting - run: echo "Hello ${{ inputs.name }}" + run: | + echo "OLD_VERSION ${{ inputs.OLD_VERSION }}" + echo "NEW_VERSION ${{ inputs.OLD_VERSION }}" + echo "OLD_SHORT_VERSION ${{ inputs.OLD_SHORT_VERSION }}" + echo "BUILD_LABEL ${{ inputs.BUILD_LABEL }}" From 3d8945ed82faacb1935797f93b2139349afc9d11 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 08:56:55 -0500 Subject: [PATCH 70/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 38 +++++++++++++-------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 4c6f48462..2e49dda30 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -3,14 +3,25 @@ name: Update files for new release workflow on: - push: - branches: - - vNext - paths: - - 'vNext.properties' - -env: - NEW_VERSION: 23.0.0.73 + inputs: + OLD_VERSION: + description: 'Enter old version' + # Default value if no value is explicitly provided + default: '23.0.0.11' + # Input has to be provided for the workflow to run + required: true + # The data type of the input + type: string + NEW_VERSION: + description: 'Enter new version' + default: '23.0.0.12' + required: true + type: string + BUILD_LABEL: + description: 'Enter build label of release driver' + default: '' + required: false + type: string jobs: automate_release_updates: @@ -33,24 +44,23 @@ jobs: - name: Run update.sh script run: bash ./update.sh - - run: echo "NEW_VERSION = ${{ env.NEW_VERSION }}" + - run: echo "NEW_VERSION = ${{ inputs.NEW_VERSION }}" - name: Commit changes uses: EndBug/add-and-commit@v9 with: default_author: github_actions author_name: GitHub Actions - author_email: mail@example.com - message: "Updates for the release of ${{ env.NEW_VERSION }}" + message: "Updates for the release of ${{ inputs.NEW_VERSION }}" add: '${{ github.workspace }}/ga/*' - new_branch: "${{ env.NEW_VERSION }}-release" + new_branch: "${{ inputs.NEW_VERSION }}-release" push: true tag_push: '--force' - name: Create Pull Request run: | - echo "NEW_VERSION = ${{ env.NEW_VERSION }}" - gh pr create -B vNext -H "${{ env.NEW_VERSION }}-release" -r mbroz2 -r leochr --title "Updates for the release of ${{ env.NEW_VERSION }}" --body "Created by Github Actions" + echo "NEW_VERSION = ${{ inputs.NEW_VERSION }}" + gh pr create -B vNext -H "${{ inputs.NEW_VERSION }}-release" -r mbroz2 -r leochr --title "Updates for the release of ${{ inputs.NEW_VERSION }}" --body "Created by Github Actions" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 73ebc15a5cca3162ed34d9809e08f30f7168ecfc Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 09:57:18 -0500 Subject: [PATCH 71/84] Update update.sh --- update.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/update.sh b/update.sh index d20cd48f2..4861aaf5c 100644 --- a/update.sh +++ b/update.sh @@ -3,7 +3,28 @@ echo "Hello from the update.sh script!" echo $(date) -. ./vNext.properties +# Set variables to the positional parameters +OLD_VERSION=$1 +NEW_VERSION=$2 +BUILD_LABEL=$3 + +# See if NEW_VERSION and OLD_VERSION fit expected pattern. +if [[ $OLD_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ && $NEW_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ ]]; +then + echo "$OLD_VERSION and $NEW_VERSION matches expected version format." +else + echo "Either $OLD_VERSION or $NEW_VERSION does not fit format." + exit 1; +fi + +# Get last digit of old version +OLD_SHORT_VERSION=${OLD_VERSION:7} + +# Temp debug +echo "OLD_VERSION = $OLD_VERSION" +echo "NEW_VERSION = $NEW_VERSION" +echo "BUILD_LABEL = $BUILD_LABEL" +echo "OLD_SHORT_VERSION = $OLD_SHORT_VERSION" echo "Copying latest files to $NEW_VERSION" cp -r ./ga/latest ./ga/$NEW_VERSION From 01198208cdb20e578d4cfbc0ec2cd0e31a0873ed Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 09:58:30 -0500 Subject: [PATCH 72/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index 2e49dda30..b6bee9d85 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -3,6 +3,7 @@ name: Update files for new release workflow on: + workflow_dispatch: inputs: OLD_VERSION: description: 'Enter old version' From 82e244fd301bbd3d6a62f549866abcff8687cf17 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 10:06:15 -0500 Subject: [PATCH 73/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index b6bee9d85..f71ce1d62 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -43,7 +43,7 @@ jobs: - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." - name: Run update.sh script - run: bash ./update.sh + run: bash ./update.sh ${{ inputs.OLD_VERSION }} ${{ inputs.NEW_VERSION }} ${{ inputs.BUILD_LABEL }} - run: echo "NEW_VERSION = ${{ inputs.NEW_VERSION }}" From 8acce2c961672705b244b4985b86d25e27924769 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 10:26:25 -0500 Subject: [PATCH 74/84] Update update.sh --- update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/update.sh b/update.sh index 4861aaf5c..e93e6e032 100644 --- a/update.sh +++ b/update.sh @@ -59,4 +59,9 @@ if [[ $(( $OLD_SHORT_VERSION % 3 )) -eq 0 ]] rm -rf ./ga/$OLD_VERSION fi +# Finally comment out "ga/*/*/resources/*" in the workspace's .gitignore file so +# the new resources directories can be committed, too. +sed -i'.bak' -e "s/ga\/\*\/\*\/resources\/\*/#ga\/\*\/\*\/resources\/\*/g" .gitignore +rm ./.gitignore.bak + echo "Done processing new file updates!"; From 573fc47a91f660a954686d90b9be5f7842786c52 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 10:27:40 -0500 Subject: [PATCH 75/84] Update updateFilesForRelease.yml --- .github/workflows/updateFilesForRelease.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml index f71ce1d62..25d5ced4d 100644 --- a/.github/workflows/updateFilesForRelease.yml +++ b/.github/workflows/updateFilesForRelease.yml @@ -20,7 +20,7 @@ on: type: string BUILD_LABEL: description: 'Enter build label of release driver' - default: '' + default: 'replace_with_gm_driver_label' required: false type: string @@ -30,9 +30,7 @@ jobs: steps: - name: Show useful information about the environment - run: | - echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - env + run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - name: Check out repository code uses: actions/checkout@v4 @@ -45,8 +43,6 @@ jobs: - name: Run update.sh script run: bash ./update.sh ${{ inputs.OLD_VERSION }} ${{ inputs.NEW_VERSION }} ${{ inputs.BUILD_LABEL }} - - run: echo "NEW_VERSION = ${{ inputs.NEW_VERSION }}" - - name: Commit changes uses: EndBug/add-and-commit@v9 with: @@ -60,7 +56,6 @@ jobs: - name: Create Pull Request run: | - echo "NEW_VERSION = ${{ inputs.NEW_VERSION }}" gh pr create -B vNext -H "${{ inputs.NEW_VERSION }}-release" -r mbroz2 -r leochr --title "Updates for the release of ${{ inputs.NEW_VERSION }}" --body "Created by Github Actions" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From d9797baced524c82def39378313a5730a0d75cca Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 12:06:45 -0500 Subject: [PATCH 76/84] Remove script to confirm theory --- .github/workflows/updateFilesForRelease.yml | 63 ------------------- update.sh | 67 --------------------- 2 files changed, 130 deletions(-) delete mode 100644 .github/workflows/updateFilesForRelease.yml delete mode 100644 update.sh diff --git a/.github/workflows/updateFilesForRelease.yml b/.github/workflows/updateFilesForRelease.yml deleted file mode 100644 index 25d5ced4d..000000000 --- a/.github/workflows/updateFilesForRelease.yml +++ /dev/null @@ -1,63 +0,0 @@ -# This is a basic workflow that is triggered by a push - -name: Update files for new release workflow - -on: - workflow_dispatch: - inputs: - OLD_VERSION: - description: 'Enter old version' - # Default value if no value is explicitly provided - default: '23.0.0.11' - # Input has to be provided for the workflow to run - required: true - # The data type of the input - type: string - NEW_VERSION: - description: 'Enter new version' - default: '23.0.0.12' - required: true - type: string - BUILD_LABEL: - description: 'Enter build label of release driver' - default: 'replace_with_gm_driver_label' - required: false - type: string - -jobs: - automate_release_updates: - runs-on: ubuntu-latest - - steps: - - name: Show useful information about the environment - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - - - name: Check out repository code - uses: actions/checkout@v4 - with: - ref: vNext - repository: wraschke/ci.docker - - - run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner." - - - name: Run update.sh script - run: bash ./update.sh ${{ inputs.OLD_VERSION }} ${{ inputs.NEW_VERSION }} ${{ inputs.BUILD_LABEL }} - - - name: Commit changes - uses: EndBug/add-and-commit@v9 - with: - default_author: github_actions - author_name: GitHub Actions - message: "Updates for the release of ${{ inputs.NEW_VERSION }}" - add: '${{ github.workspace }}/ga/*' - new_branch: "${{ inputs.NEW_VERSION }}-release" - push: true - tag_push: '--force' - - - name: Create Pull Request - run: | - gh pr create -B vNext -H "${{ inputs.NEW_VERSION }}-release" -r mbroz2 -r leochr --title "Updates for the release of ${{ inputs.NEW_VERSION }}" --body "Created by Github Actions" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - run: echo "🍏 This job's status is ${{ job.status }}." diff --git a/update.sh b/update.sh deleted file mode 100644 index e93e6e032..000000000 --- a/update.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -echo "Hello from the update.sh script!" -echo $(date) - -# Set variables to the positional parameters -OLD_VERSION=$1 -NEW_VERSION=$2 -BUILD_LABEL=$3 - -# See if NEW_VERSION and OLD_VERSION fit expected pattern. -if [[ $OLD_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ && $NEW_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ ]]; -then - echo "$OLD_VERSION and $NEW_VERSION matches expected version format." -else - echo "Either $OLD_VERSION or $NEW_VERSION does not fit format." - exit 1; -fi - -# Get last digit of old version -OLD_SHORT_VERSION=${OLD_VERSION:7} - -# Temp debug -echo "OLD_VERSION = $OLD_VERSION" -echo "NEW_VERSION = $NEW_VERSION" -echo "BUILD_LABEL = $BUILD_LABEL" -echo "OLD_SHORT_VERSION = $OLD_SHORT_VERSION" - -echo "Copying latest files to $NEW_VERSION" -cp -r ./ga/latest ./ga/$NEW_VERSION - -# Perform the substitutions by searching in newly created directory -for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do - echo "Processing $file"; - - sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; - sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; - - # Do this substitution only in new release directory - if [[ "$file" == "./ga/$NEW_VERSION/"* ]]; - then - sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; - sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; - fi - - # Clean up temp files - rm $file.bak - -done - -cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt; -sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt; -rm ./ga/$NEW_VERSION/images.txt.bak; - -if [[ $(( $OLD_SHORT_VERSION % 3 )) -eq 0 ]] - then - : - else - rm -rf ./ga/$OLD_VERSION - fi - -# Finally comment out "ga/*/*/resources/*" in the workspace's .gitignore file so -# the new resources directories can be committed, too. -sed -i'.bak' -e "s/ga\/\*\/\*\/resources\/\*/#ga\/\*\/\*\/resources\/\*/g" .gitignore -rm ./.gitignore.bak - -echo "Done processing new file updates!"; From 477a44bb60afbc3aa75470ca2cd5cf140c376526 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 12:23:49 -0500 Subject: [PATCH 77/84] Restore update.sh script to vNext --- update.sh | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 update.sh diff --git a/update.sh b/update.sh new file mode 100644 index 000000000..faf12f36e --- /dev/null +++ b/update.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +echo "Hello from the update.sh script!" +echo $(date) + +# Set variables to the positional parameters +OLD_VERSION=$1 +NEW_VERSION=$2 +BUILD_LABEL=$3 + +# See if NEW_VERSION and OLD_VERSION fit expected pattern. +if [[ $OLD_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ && $NEW_VERSION =~ 2[3-9]\.0\.0\.[0-9]+ ]]; +then + echo "$OLD_VERSION and $NEW_VERSION matches expected version format." +else + echo "Either $OLD_VERSION or $NEW_VERSION does not fit expected version format." + exit 1; +fi + +# Get last digit of old version +OLD_SHORT_VERSION=${OLD_VERSION:7} + +echo "OLD_VERSION = $OLD_VERSION" +echo "NEW_VERSION = $NEW_VERSION" +echo "BUILD_LABEL = $BUILD_LABEL" +echo "OLD_SHORT_VERSION = $OLD_SHORT_VERSION" + +echo "Copying latest files to $NEW_VERSION" +cp -r ./ga/latest ./ga/$NEW_VERSION + +# Perform the substitutions in both latest and $NEW_VERSION directories. +for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do + echo "Processing $file"; + + sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/" $file; + sed -i'.bak' -e "s/ARG LIBERTY_BUILD_LABEL=.*/ARG LIBERTY_BUILD_LABEL=$BUILD_LABEL/g" $file; + + # Do these substitutions only in $NEW_VERSION, not latest. + if [[ "$file" == "./ga/$NEW_VERSION/"* ]]; + then + sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file; + sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file; + fi + + # Clean up temp files + rm $file.bak + +done + +cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt; +sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt; +rm ./ga/$NEW_VERSION/images.txt.bak; + +if [[ $(( $OLD_SHORT_VERSION % 3 )) -eq 0 ]] + then + : + else + rm -rf ./ga/$OLD_VERSION + fi + +# Finally, comment out "ga/*/*/resources/*" in .gitignore so +# newly created $NEW_VERSION/full/resources and $NEW_VERSION/kernel/resources +# directories can be committed and pushed. +sed -i'.bak' -e "s/ga\/\*\/\*\/resources\/\*/#ga\/\*\/\*\/resources\/\*/g" .gitignore +rm ./.gitignore.bak + +echo "Done performing file updates."; From 663af59bb4aff3edded8d24a52300e8452d212c6 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Fri, 27 Oct 2023 12:25:45 -0500 Subject: [PATCH 78/84] Workflow file not needed in branch checked out on runner --- .github/workflows/manual.yml | 50 ------------------------------------ 1 file changed, 50 deletions(-) delete mode 100644 .github/workflows/manual.yml diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml deleted file mode 100644 index 1d0cc4857..000000000 --- a/.github/workflows/manual.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This is a basic workflow that is manually triggered - -name: vNext manual workflow - -# Controls when the action will run. Workflow runs when manually triggered using the UI -# or API. -on: - workflow_dispatch: - # Inputs the workflow accepts. - inputs: - OLD_VERSION: - description: 'Enter old version' - # Default value if no value is explicitly provided - default: '23.0.0.11' - # Input has to be provided for the workflow to run - required: true - # The data type of the input - type: string - NEW_VERSION: - description: 'Enter new version' - default: '23.0.0.12' - required: true - type: string - OLD_SHORT_VERSION: - description: 'Enter single digit of old version' - default: '11' - required: true - type: string - BUILD_LABEL: - description: 'Enter build label of release driver' - default: '' - required: true - type: string - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "greet" - greet: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Runs a single command using the runners shell - - name: Send greeting - run: | - echo "OLD_VERSION ${{ inputs.OLD_VERSION }}" - echo "NEW_VERSION ${{ inputs.OLD_VERSION }}" - echo "OLD_SHORT_VERSION ${{ inputs.OLD_SHORT_VERSION }}" - echo "BUILD_LABEL ${{ inputs.BUILD_LABEL }}" From 05b2631619220405fbdeb9ebd69be41d0335ec19 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 31 Oct 2023 11:56:55 -0500 Subject: [PATCH 79/84] Rename script and put in subdir --- update.sh => internal/create-new-release.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) rename update.sh => internal/create-new-release.sh (89%) diff --git a/update.sh b/internal/create-new-release.sh similarity index 89% rename from update.sh rename to internal/create-new-release.sh index faf12f36e..07dd2d71d 100644 --- a/update.sh +++ b/internal/create-new-release.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo "Hello from the update.sh script!" +echo "Hello from the create-new-release.sh script!" echo $(date) # Set variables to the positional parameters @@ -47,6 +47,11 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do done +# Update the .travis.yml file. +sed -i'.bak' -e "s/RELEASE=\.\.\/releases\/$OLD_VERSION/RELEASE=\.\.\/releases\/$NEW_VERSION/" ./.travis.yml; +rm ./.travis.yml.bak; + +# Update the images.txt file cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt; sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt; rm ./ga/$NEW_VERSION/images.txt.bak; From 8bdf67d00d38cf3dc5f0a607e2a11ccdf4f57446 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 31 Oct 2023 12:10:14 -0500 Subject: [PATCH 80/84] Restore location structure of script --- internal/create-new-release.sh => create-new-release.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename internal/create-new-release.sh => create-new-release.sh (100%) diff --git a/internal/create-new-release.sh b/create-new-release.sh similarity index 100% rename from internal/create-new-release.sh rename to create-new-release.sh From 373d9bb68e12312c68fd3dab81ce6c41b5fe281e Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 31 Oct 2023 12:16:45 -0500 Subject: [PATCH 81/84] Update create-new-release.sh --- create-new-release.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/create-new-release.sh b/create-new-release.sh index 07dd2d71d..4ff6399ec 100644 --- a/create-new-release.sh +++ b/create-new-release.sh @@ -48,6 +48,9 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do done # Update the .travis.yml file. +if test -f ./.travis.yml; then + echo ".travis.yml exists." +fi sed -i'.bak' -e "s/RELEASE=\.\.\/releases\/$OLD_VERSION/RELEASE=\.\.\/releases\/$NEW_VERSION/" ./.travis.yml; rm ./.travis.yml.bak; From a88735149a2d54050c3007145ae4d39521f026a8 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Tue, 31 Oct 2023 12:27:58 -0500 Subject: [PATCH 82/84] Update create-new-release.sh --- create-new-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create-new-release.sh b/create-new-release.sh index 4ff6399ec..ac8e7cfe4 100644 --- a/create-new-release.sh +++ b/create-new-release.sh @@ -51,7 +51,7 @@ done if test -f ./.travis.yml; then echo ".travis.yml exists." fi -sed -i'.bak' -e "s/RELEASE=\.\.\/releases\/$OLD_VERSION/RELEASE=\.\.\/releases\/$NEW_VERSION/" ./.travis.yml; +sed -i'.bak' -e "s/RELEASE=\.\.\/ga\/$OLD_VERSION/RELEASE=\.\.\/ga\/$NEW_VERSION/" ./.travis.yml; rm ./.travis.yml.bak; # Update the images.txt file From aa7d52bdd3c2bc4dce658d363ef6fea38d357f14 Mon Sep 17 00:00:00 2001 From: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:28:42 +0000 Subject: [PATCH 83/84] Updates for the release of 23.0.0.12 --- .travis.yml | 2 +- ga/23.0.0.11/images.txt | 18 ------------------ ga/{23.0.0.11 => 23.0.0.12}/README.md | 0 .../full/Dockerfile.ubi.ibmjava8 | 4 ++-- .../full/Dockerfile.ubi.openjdk11 | 4 ++-- .../full/Dockerfile.ubi.openjdk17 | 4 ++-- .../full/Dockerfile.ubi.openjdk8 | 4 ++-- .../full/Dockerfile.ubuntu.ibmjava8 | 2 +- .../full/Dockerfile.ubuntu.openjdk11 | 2 +- .../full/Dockerfile.ubuntu.openjdk17 | 2 +- ga/{23.0.0.11 => 23.0.0.12}/full/README.md | 0 .../full/resources/.gitkeep | 0 ga/{23.0.0.11 => 23.0.0.12}/full/server.xml | 0 ga/23.0.0.12/images.txt | 18 ++++++++++++++++++ .../kernel/Dockerfile.ubi.ibmjava8 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk11 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk17 | 6 +++--- .../kernel/Dockerfile.ubi.openjdk8 | 6 +++--- .../kernel/Dockerfile.ubuntu.ibmjava8 | 4 ++-- .../kernel/Dockerfile.ubuntu.openjdk11 | 4 ++-- .../kernel/Dockerfile.ubuntu.openjdk17 | 4 ++-- ga/{23.0.0.11 => 23.0.0.12}/kernel/NOTICES | 0 ga/{23.0.0.11 => 23.0.0.12}/kernel/README.md | 0 .../kernel/fixes/.gitkeep | 0 .../kernel/helpers/build/checkpoint.sh | 0 .../hazelcast-client.xml | 0 .../hazelcast-embedded.xml | 0 .../hazelcast-sessioncache-config.xml | 0 .../hazelcast-sessioncache.xml | 0 .../configuration_snippets/http-endpoint.xml | 0 .../http-ssl-endpoint.xml | 0 .../configuration_snippets/iiop-endpoint.xml | 0 .../iiop-ssl-endpoint.xml | 0 .../infinispan-client-sessioncache-config.xml | 0 .../infinispan-client-sessioncache.xml | 0 .../configuration_snippets/jms-endpoint.xml | 0 .../jms-ssl-endpoint.xml | 0 .../build/configuration_snippets/keystore.xml | 0 .../configuration_snippets/mp-health-check.xml | 0 .../configuration_snippets/mp-monitoring.xml | 0 .../configuration_snippets/oidc-config.xml | 0 .../build/configuration_snippets/oidc.xml | 0 .../sessioncache-features.xml | 0 .../configuration_snippets/sso-facebook.xml | 0 .../configuration_snippets/sso-features.xml | 0 .../configuration_snippets/sso-github.xml | 0 .../configuration_snippets/sso-google.xml | 0 .../configuration_snippets/sso-linkedin.xml | 0 .../configuration_snippets/sso-oauth2.xml | 0 .../build/configuration_snippets/sso-oidc.xml | 0 .../configuration_snippets/sso-twitter.xml | 0 .../build/configuration_snippets/tls.xml | 0 .../configuration_snippets/trustDefault.xml | 0 .../configuration_snippets/truststore.xml | 0 .../kernel/helpers/build/configure.sh | 0 .../kernel/helpers/build/features.sh | 0 .../helpers/build/infinispan-client-setup.sh | 0 .../build/internal/features-installed.sh | 0 .../kernel/helpers/build/pidplus.sh | 0 .../kernel/helpers/build/populate_scc.sh | 0 .../kernel/helpers/runtime/docker-server.sh | 0 .../kernel/helpers/runtime/restore-server.sh | 0 .../kernel/resources/.gitkeep | 0 .../oidcProvider/Dockerfile | 0 .../oidcProvider/Dockerfile.java11 | 2 +- .../oidcProvider/README.md | 0 .../oidcProvider/server.xml | 0 ga/latest/kernel/Dockerfile.ubi.ibmjava8 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk11 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk17 | 6 +++--- ga/latest/kernel/Dockerfile.ubi.openjdk8 | 6 +++--- ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk11 | 4 ++-- ga/latest/kernel/Dockerfile.ubuntu.openjdk17 | 4 ++-- 74 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 ga/23.0.0.11/images.txt rename ga/{23.0.0.11 => 23.0.0.12}/README.md (100%) rename ga/{23.0.0.11 => 23.0.0.12}/full/Dockerfile.ubi.ibmjava8 (93%) rename ga/{23.0.0.11 => 23.0.0.12}/full/Dockerfile.ubi.openjdk11 (93%) rename ga/{23.0.0.11 => 23.0.0.12}/full/Dockerfile.ubi.openjdk17 (93%) rename ga/{23.0.0.11 => 23.0.0.12}/full/Dockerfile.ubi.openjdk8 (93%) rename ga/{23.0.0.11 => 23.0.0.12}/full/Dockerfile.ubuntu.ibmjava8 (96%) rename ga/{23.0.0.11 => 23.0.0.12}/full/Dockerfile.ubuntu.openjdk11 (96%) rename ga/{23.0.0.11 => 23.0.0.12}/full/Dockerfile.ubuntu.openjdk17 (96%) rename ga/{23.0.0.11 => 23.0.0.12}/full/README.md (100%) rename ga/{23.0.0.11 => 23.0.0.12}/full/resources/.gitkeep (100%) rename ga/{23.0.0.11 => 23.0.0.12}/full/server.xml (100%) create mode 100644 ga/23.0.0.12/images.txt rename ga/{23.0.0.11 => 23.0.0.12}/kernel/Dockerfile.ubi.ibmjava8 (98%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/Dockerfile.ubi.openjdk11 (98%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/Dockerfile.ubi.openjdk17 (98%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/Dockerfile.ubi.openjdk8 (98%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/Dockerfile.ubuntu.ibmjava8 (98%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/Dockerfile.ubuntu.openjdk11 (98%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/Dockerfile.ubuntu.openjdk17 (98%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/NOTICES (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/README.md (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/fixes/.gitkeep (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/checkpoint.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/hazelcast-client.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/http-endpoint.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/jms-endpoint.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/keystore.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/mp-health-check.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/mp-monitoring.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/oidc-config.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/oidc.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sessioncache-features.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sso-facebook.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sso-features.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sso-github.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sso-google.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sso-linkedin.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sso-oauth2.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sso-oidc.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/sso-twitter.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/tls.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/trustDefault.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configuration_snippets/truststore.xml (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/configure.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/features.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/infinispan-client-setup.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/internal/features-installed.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/pidplus.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/build/populate_scc.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/runtime/docker-server.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/helpers/runtime/restore-server.sh (100%) rename ga/{23.0.0.11 => 23.0.0.12}/kernel/resources/.gitkeep (100%) rename ga/{23.0.0.11 => 23.0.0.12}/oidcProvider/Dockerfile (100%) rename ga/{23.0.0.11 => 23.0.0.12}/oidcProvider/Dockerfile.java11 (96%) rename ga/{23.0.0.11 => 23.0.0.12}/oidcProvider/README.md (100%) rename ga/{23.0.0.11 => 23.0.0.12}/oidcProvider/server.xml (100%) diff --git a/.travis.yml b/.travis.yml index 0255093eb..89976ea7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: env: - RELEASE=../ga/23.0.0.6 - RELEASE=../ga/23.0.0.9 - - RELEASE=../ga/23.0.0.11 + - RELEASE=../ga/23.0.0.12 - RELEASE=../ga/latest script: diff --git a/ga/23.0.0.11/images.txt b/ga/23.0.0.11/images.txt deleted file mode 100644 index 1cad09aab..000000000 --- a/ga/23.0.0.11/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:23.0.0.11-kernel ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.11-kernel-java11-openj9 ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.11-kernel-java17-openj9 ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi ../ga/23.0.0.11/kernel ../ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:23.0.0.11-full ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.11-full-java11-openj9 ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.11-full-java17-openj9 ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.11-full-java8-ibmjava-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.11-full-java8-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.11-full-java11-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.11-full-java17-openj9-ubi ../ga/23.0.0.11/full ../ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 -websphere-liberty:beta ../beta -websphere-liberty:test-stock-quote test-stock-quote -websphere-liberty:test-stock-trader test-stock-trader -websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/23.0.0.11/README.md b/ga/23.0.0.12/README.md similarity index 100% rename from ga/23.0.0.11/README.md rename to ga/23.0.0.12/README.md diff --git a/ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.12/full/Dockerfile.ubi.ibmjava8 similarity index 93% rename from ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.12/full/Dockerfile.ubi.ibmjava8 index d28157291..b7f965eac 100644 --- a/ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.12/full/Dockerfile.ubi.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.12-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.12-kernel-java8-ibmjava-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.12/full/Dockerfile.ubi.openjdk11 similarity index 93% rename from ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.12/full/Dockerfile.ubi.openjdk11 index f0c03ec91..2cc484857 100644 --- a/ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.12/full/Dockerfile.ubi.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.12-kernel-java11-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.12-kernel-java11-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.12/full/Dockerfile.ubi.openjdk17 similarity index 93% rename from ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.12/full/Dockerfile.ubi.openjdk17 index 57c18c399..7c0b01f06 100644 --- a/ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.12/full/Dockerfile.ubi.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.12-kernel-java17-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.12-kernel-java17-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.12/full/Dockerfile.ubi.openjdk8 similarity index 93% rename from ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.12/full/Dockerfile.ubi.openjdk8 index 9605016bf..7e56136bf 100644 --- a/ga/23.0.0.11/full/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.12/full/Dockerfile.ubi.openjdk8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.12-kernel-java8-openj9-ubi FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -36,7 +36,7 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi +ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.12-kernel-java8-openj9-ubi FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.12/full/Dockerfile.ubuntu.ibmjava8 similarity index 96% rename from ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.12/full/Dockerfile.ubuntu.ibmjava8 index eeba0c94d..278a706a2 100644 --- a/ga/23.0.0.11/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.12/full/Dockerfile.ubuntu.ibmjava8 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.11-kernel-java8-ibmjava +FROM websphere-liberty:23.0.0.12-kernel-java8-ibmjava ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 similarity index 96% rename from ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 index 5e08b1efc..56ceef733 100644 --- a/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.11-kernel-java11-openj9 +FROM websphere-liberty:23.0.0.12-kernel-java11-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 similarity index 96% rename from ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 index 1ab063843..4903d3e51 100644 --- a/ga/23.0.0.11/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:23.0.0.11-kernel-java17-openj9 +FROM websphere-liberty:23.0.0.12-kernel-java17-openj9 ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.11/full/README.md b/ga/23.0.0.12/full/README.md similarity index 100% rename from ga/23.0.0.11/full/README.md rename to ga/23.0.0.12/full/README.md diff --git a/ga/23.0.0.11/full/resources/.gitkeep b/ga/23.0.0.12/full/resources/.gitkeep similarity index 100% rename from ga/23.0.0.11/full/resources/.gitkeep rename to ga/23.0.0.12/full/resources/.gitkeep diff --git a/ga/23.0.0.11/full/server.xml b/ga/23.0.0.12/full/server.xml similarity index 100% rename from ga/23.0.0.11/full/server.xml rename to ga/23.0.0.12/full/server.xml diff --git a/ga/23.0.0.12/images.txt b/ga/23.0.0.12/images.txt new file mode 100644 index 000000000..98a4a07ac --- /dev/null +++ b/ga/23.0.0.12/images.txt @@ -0,0 +1,18 @@ +websphere-liberty:23.0.0.12-kernel ../ga/23.0.0.12/kernel ../ga/23.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.12-kernel-java11-openj9 ../ga/23.0.0.12/kernel ../ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.12-kernel-java17-openj9 ../ga/23.0.0.12/kernel ../ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.12-kernel-java8-ibmjava-ubi ../ga/23.0.0.12/kernel ../ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.12-kernel-java8-openj9-ubi ../ga/23.0.0.12/kernel ../ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.12-kernel-java11-openj9-ubi ../ga/23.0.0.12/kernel ../ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.12-kernel-java17-openj9-ubi ../ga/23.0.0.12/kernel ../ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 +websphere-liberty:23.0.0.12-full ../ga/23.0.0.12/full ../ga/23.0.0.12/full/Dockerfile.ubuntu.ibmjava8 +websphere-liberty:23.0.0.12-full-java11-openj9 ../ga/23.0.0.12/full ../ga/23.0.0.12/full/Dockerfile.ubuntu.openjdk11 +websphere-liberty:23.0.0.12-full-java17-openj9 ../ga/23.0.0.12/full ../ga/23.0.0.12/full/Dockerfile.ubuntu.openjdk17 +websphere-liberty:23.0.0.12-full-java8-ibmjava-ubi ../ga/23.0.0.12/full ../ga/23.0.0.12/full/Dockerfile.ubi.ibmjava8 +websphere-liberty:23.0.0.12-full-java8-openj9-ubi ../ga/23.0.0.12/full ../ga/23.0.0.12/full/Dockerfile.ubi.openjdk8 +websphere-liberty:23.0.0.12-full-java11-openj9-ubi ../ga/23.0.0.12/full ../ga/23.0.0.12/full/Dockerfile.ubi.openjdk11 +websphere-liberty:23.0.0.12-full-java17-openj9-ubi ../ga/23.0.0.12/full ../ga/23.0.0.12/full/Dockerfile.ubi.openjdk17 +websphere-liberty:beta ../beta +websphere-liberty:test-stock-quote test-stock-quote +websphere-liberty:test-stock-trader test-stock-trader +websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 similarity index 98% rename from ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 rename to ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 index a1ff55a89..baac67fe4 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 similarity index 98% rename from ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 rename to ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 index a82697b57..1df74e3a4 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 similarity index 98% rename from ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 rename to ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 index 93e427dce..97c4f4913 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 similarity index 98% rename from ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 rename to ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 index 60013803b..d417d4d35 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 similarity index 98% rename from ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 rename to ga/23.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 index 70c0aacfd..a55ebe80e 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 similarity index 98% rename from ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 rename to ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 index aebcfe99a..f826e9d91 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 similarity index 98% rename from ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 rename to ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 index d467956f5..8c63a6812 100644 --- a/ga/23.0.0.11/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/23.0.0.11/kernel/NOTICES b/ga/23.0.0.12/kernel/NOTICES similarity index 100% rename from ga/23.0.0.11/kernel/NOTICES rename to ga/23.0.0.12/kernel/NOTICES diff --git a/ga/23.0.0.11/kernel/README.md b/ga/23.0.0.12/kernel/README.md similarity index 100% rename from ga/23.0.0.11/kernel/README.md rename to ga/23.0.0.12/kernel/README.md diff --git a/ga/23.0.0.11/kernel/fixes/.gitkeep b/ga/23.0.0.12/kernel/fixes/.gitkeep similarity index 100% rename from ga/23.0.0.11/kernel/fixes/.gitkeep rename to ga/23.0.0.12/kernel/fixes/.gitkeep diff --git a/ga/23.0.0.11/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.12/kernel/helpers/build/checkpoint.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/checkpoint.sh rename to ga/23.0.0.12/kernel/helpers/build/checkpoint.sh diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/hazelcast-client.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-client.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/hazelcast-client.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/http-endpoint.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-endpoint.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/http-endpoint.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/jms-endpoint.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-endpoint.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/jms-endpoint.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/keystore.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/keystore.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/mp-health-check.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-health-check.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/mp-health-check.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/mp-monitoring.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/mp-monitoring.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/mp-monitoring.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/oidc-config.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc-config.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/oidc-config.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/oidc.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/oidc.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/oidc.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sessioncache-features.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sessioncache-features.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sessioncache-features.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-facebook.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-facebook.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-facebook.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-features.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-features.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-features.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-github.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-github.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-github.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-google.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-google.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-google.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-linkedin.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-linkedin.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-linkedin.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-oauth2.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oauth2.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-oauth2.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-oidc.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-oidc.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-oidc.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-twitter.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/sso-twitter.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/sso-twitter.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/tls.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/tls.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/tls.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/tls.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/trustDefault.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/trustDefault.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/trustDefault.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/23.0.0.12/kernel/helpers/build/configuration_snippets/truststore.xml similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml rename to ga/23.0.0.12/kernel/helpers/build/configuration_snippets/truststore.xml diff --git a/ga/23.0.0.11/kernel/helpers/build/configure.sh b/ga/23.0.0.12/kernel/helpers/build/configure.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/configure.sh rename to ga/23.0.0.12/kernel/helpers/build/configure.sh diff --git a/ga/23.0.0.11/kernel/helpers/build/features.sh b/ga/23.0.0.12/kernel/helpers/build/features.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/features.sh rename to ga/23.0.0.12/kernel/helpers/build/features.sh diff --git a/ga/23.0.0.11/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.12/kernel/helpers/build/infinispan-client-setup.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/infinispan-client-setup.sh rename to ga/23.0.0.12/kernel/helpers/build/infinispan-client-setup.sh diff --git a/ga/23.0.0.11/kernel/helpers/build/internal/features-installed.sh b/ga/23.0.0.12/kernel/helpers/build/internal/features-installed.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/internal/features-installed.sh rename to ga/23.0.0.12/kernel/helpers/build/internal/features-installed.sh diff --git a/ga/23.0.0.11/kernel/helpers/build/pidplus.sh b/ga/23.0.0.12/kernel/helpers/build/pidplus.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/pidplus.sh rename to ga/23.0.0.12/kernel/helpers/build/pidplus.sh diff --git a/ga/23.0.0.11/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.12/kernel/helpers/build/populate_scc.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/build/populate_scc.sh rename to ga/23.0.0.12/kernel/helpers/build/populate_scc.sh diff --git a/ga/23.0.0.11/kernel/helpers/runtime/docker-server.sh b/ga/23.0.0.12/kernel/helpers/runtime/docker-server.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/runtime/docker-server.sh rename to ga/23.0.0.12/kernel/helpers/runtime/docker-server.sh diff --git a/ga/23.0.0.11/kernel/helpers/runtime/restore-server.sh b/ga/23.0.0.12/kernel/helpers/runtime/restore-server.sh similarity index 100% rename from ga/23.0.0.11/kernel/helpers/runtime/restore-server.sh rename to ga/23.0.0.12/kernel/helpers/runtime/restore-server.sh diff --git a/ga/23.0.0.11/kernel/resources/.gitkeep b/ga/23.0.0.12/kernel/resources/.gitkeep similarity index 100% rename from ga/23.0.0.11/kernel/resources/.gitkeep rename to ga/23.0.0.12/kernel/resources/.gitkeep diff --git a/ga/23.0.0.11/oidcProvider/Dockerfile b/ga/23.0.0.12/oidcProvider/Dockerfile similarity index 100% rename from ga/23.0.0.11/oidcProvider/Dockerfile rename to ga/23.0.0.12/oidcProvider/Dockerfile diff --git a/ga/23.0.0.11/oidcProvider/Dockerfile.java11 b/ga/23.0.0.12/oidcProvider/Dockerfile.java11 similarity index 96% rename from ga/23.0.0.11/oidcProvider/Dockerfile.java11 rename to ga/23.0.0.12/oidcProvider/Dockerfile.java11 index e722d7d7f..92d182e5e 100644 --- a/ga/23.0.0.11/oidcProvider/Dockerfile.java11 +++ b/ga/23.0.0.12/oidcProvider/Dockerfile.java11 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM websphere-liberty:kernel-java11 +FROM websphere-liberty:23.0.0.12-kernel-java11 ARG REPOSITORIES_PROPERTIES="" diff --git a/ga/23.0.0.11/oidcProvider/README.md b/ga/23.0.0.12/oidcProvider/README.md similarity index 100% rename from ga/23.0.0.11/oidcProvider/README.md rename to ga/23.0.0.12/oidcProvider/README.md diff --git a/ga/23.0.0.11/oidcProvider/server.xml b/ga/23.0.0.12/oidcProvider/server.xml similarity index 100% rename from ga/23.0.0.11/oidcProvider/server.xml rename to ga/23.0.0.12/oidcProvider/server.xml diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 index a1ff55a89..baac67fe4 100644 --- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11 index a82697b57..1df74e3a4 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17 index 93e427dce..97c4f4913 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8 index 60013803b..d417d4d35 100644 --- a/ga/latest/kernel/Dockerfile.ubi.openjdk8 +++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8 @@ -19,7 +19,7 @@ USER root ARG VERBOSE=false # Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.11 +ARG LIBERTY_VERSION=23.0.0.12 ARG LIBERTY_URL ARG DOWNLOAD_OPTIONS="" @@ -45,8 +45,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 index 70c0aacfd..a55ebe80e 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 index aebcfe99a..f826e9d91 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 index d467956f5..8c63a6812 100644 --- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 @@ -19,8 +19,8 @@ USER root ARG VERBOSE=false ARG OPENJ9_SCC=true -ARG LIBERTY_VERSION=23.0.0.11 -ARG LIBERTY_BUILD_LABEL=cl231120231014-2002 +ARG LIBERTY_VERSION=23.0.0.12 +ARG LIBERTY_BUILD_LABEL=replace_with_gm_driver_label LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ org.opencontainers.image.vendor="IBM" \ From 3db302b609b18a8914b895e566fbed7237fa4ad8 Mon Sep 17 00:00:00 2001 From: Wendy Raschke Date: Wed, 15 Nov 2023 16:09:51 -0600 Subject: [PATCH 84/84] Remove 23.0.0.6 from versions to build --- .travis.yml | 1 - ga/23.0.0.6/README.md | 6 - ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8 | 51 ---- ga/23.0.0.6/full/Dockerfile.ubi.openjdk11 | 51 ---- ga/23.0.0.6/full/Dockerfile.ubi.openjdk17 | 51 ---- ga/23.0.0.6/full/Dockerfile.ubi.openjdk8 | 51 ---- ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 | 38 --- ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 | 38 --- ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 | 38 --- ga/23.0.0.6/full/README.md | 7 - ga/23.0.0.6/full/resources/.gitkeep | 0 ga/23.0.0.6/full/server.xml | 36 --- ga/23.0.0.6/images.txt | 18 -- ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 | 175 -------------- ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk11 | 175 -------------- ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk17 | 175 -------------- ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk8 | 175 -------------- ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8 | 156 ------------- .../kernel/Dockerfile.ubuntu.openjdk11 | 151 ------------ .../kernel/Dockerfile.ubuntu.openjdk17 | 151 ------------ ga/23.0.0.6/kernel/NOTICES | 72 ------ ga/23.0.0.6/kernel/README.md | 9 - ga/23.0.0.6/kernel/fixes/.gitkeep | 2 - .../kernel/helpers/build/checkpoint.sh | 13 -- .../hazelcast-client.xml | 16 -- .../hazelcast-embedded.xml | 19 -- .../hazelcast-sessioncache-config.xml | 8 - .../hazelcast-sessioncache.xml | 11 - .../configuration_snippets/http-endpoint.xml | 5 - .../http-ssl-endpoint.xml | 6 - .../configuration_snippets/iiop-endpoint.xml | 5 - .../iiop-ssl-endpoint.xml | 8 - .../infinispan-client-sessioncache-config.xml | 16 -- .../infinispan-client-sessioncache.xml | 19 -- .../configuration_snippets/jms-endpoint.xml | 5 - .../jms-ssl-endpoint.xml | 5 - .../build/configuration_snippets/keystore.xml | 3 - .../mp-health-check.xml | 6 - .../configuration_snippets/mp-monitoring.xml | 9 - .../configuration_snippets/oidc-config.xml | 8 - .../build/configuration_snippets/oidc.xml | 6 - .../sessioncache-features.xml | 5 - .../configuration_snippets/sso-facebook.xml | 19 -- .../configuration_snippets/sso-features.xml | 7 - .../configuration_snippets/sso-github.xml | 24 -- .../configuration_snippets/sso-google.xml | 19 -- .../configuration_snippets/sso-linkedin.xml | 19 -- .../configuration_snippets/sso-oauth2.xml | 51 ---- .../build/configuration_snippets/sso-oidc.xml | 38 --- .../configuration_snippets/sso-twitter.xml | 17 -- .../build/configuration_snippets/tls.xml | 5 - .../configuration_snippets/trustDefault.xml | 4 - .../configuration_snippets/truststore.xml | 5 - ga/23.0.0.6/kernel/helpers/build/configure.sh | 219 ------------------ ga/23.0.0.6/kernel/helpers/build/features.sh | 48 ---- .../helpers/build/infinispan-client-setup.sh | 35 --- .../build/internal/features-installed.sh | 9 - ga/23.0.0.6/kernel/helpers/build/pidplus.sh | 6 - .../kernel/helpers/build/populate_scc.sh | 140 ----------- .../kernel/helpers/runtime/docker-server.sh | 159 ------------- .../kernel/helpers/runtime/restore-server.sh | 6 - ga/23.0.0.6/kernel/resources/.gitkeep | 0 ga/23.0.0.6/oidcProvider/Dockerfile | 32 --- ga/23.0.0.6/oidcProvider/Dockerfile.java11 | 32 --- ga/23.0.0.6/oidcProvider/README.md | 7 - ga/23.0.0.6/oidcProvider/server.xml | 143 ------------ 66 files changed, 2844 deletions(-) delete mode 100644 ga/23.0.0.6/README.md delete mode 100644 ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8 delete mode 100644 ga/23.0.0.6/full/Dockerfile.ubi.openjdk11 delete mode 100644 ga/23.0.0.6/full/Dockerfile.ubi.openjdk17 delete mode 100644 ga/23.0.0.6/full/Dockerfile.ubi.openjdk8 delete mode 100644 ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 delete mode 100644 ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 delete mode 100644 ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 delete mode 100644 ga/23.0.0.6/full/README.md delete mode 100644 ga/23.0.0.6/full/resources/.gitkeep delete mode 100644 ga/23.0.0.6/full/server.xml delete mode 100644 ga/23.0.0.6/images.txt delete mode 100644 ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 delete mode 100644 ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk11 delete mode 100644 ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk17 delete mode 100644 ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk8 delete mode 100644 ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8 delete mode 100644 ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11 delete mode 100644 ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17 delete mode 100644 ga/23.0.0.6/kernel/NOTICES delete mode 100644 ga/23.0.0.6/kernel/README.md delete mode 100644 ga/23.0.0.6/kernel/fixes/.gitkeep delete mode 100755 ga/23.0.0.6/kernel/helpers/build/checkpoint.sh delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-client.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/http-endpoint.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/jms-endpoint.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/mp-health-check.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/mp-monitoring.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/oidc-config.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/oidc.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sessioncache-features.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-facebook.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-features.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-github.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-google.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-linkedin.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-oauth2.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-oidc.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-twitter.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/tls.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/trustDefault.xml delete mode 100644 ga/23.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml delete mode 100755 ga/23.0.0.6/kernel/helpers/build/configure.sh delete mode 100755 ga/23.0.0.6/kernel/helpers/build/features.sh delete mode 100755 ga/23.0.0.6/kernel/helpers/build/infinispan-client-setup.sh delete mode 100755 ga/23.0.0.6/kernel/helpers/build/internal/features-installed.sh delete mode 100755 ga/23.0.0.6/kernel/helpers/build/pidplus.sh delete mode 100755 ga/23.0.0.6/kernel/helpers/build/populate_scc.sh delete mode 100755 ga/23.0.0.6/kernel/helpers/runtime/docker-server.sh delete mode 100755 ga/23.0.0.6/kernel/helpers/runtime/restore-server.sh delete mode 100644 ga/23.0.0.6/kernel/resources/.gitkeep delete mode 100644 ga/23.0.0.6/oidcProvider/Dockerfile delete mode 100644 ga/23.0.0.6/oidcProvider/Dockerfile.java11 delete mode 100644 ga/23.0.0.6/oidcProvider/README.md delete mode 100644 ga/23.0.0.6/oidcProvider/server.xml diff --git a/.travis.yml b/.travis.yml index 89976ea7c..83c91e7c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ services: before_install: - sudo apt-get update env: - - RELEASE=../ga/23.0.0.6 - RELEASE=../ga/23.0.0.9 - RELEASE=../ga/23.0.0.12 - RELEASE=../ga/latest diff --git a/ga/23.0.0.6/README.md b/ga/23.0.0.6/README.md deleted file mode 100644 index e0d4b8c1a..000000000 --- a/ga/23.0.0.6/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# WebSphere Application Server Developer Edition Liberty image - -Under this directory you can find build scripts for WebSphere Application Server Liberty container images: - -* [WebSphere Application Server Developer Edition Liberty, Kernel](kernel) -* [WebSphere Application Server Developer Edition Liberty, Full](full) diff --git a/ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8 deleted file mode 100644 index 117065353..000000000 --- a/ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8 +++ /dev/null @@ -1,51 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java8-ibmjava-ubi -FROM $PARENT_IMAGE AS installBundle - -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -# If there is a local copy of the repository use that instead -COPY resources/ /tmp/ - -# Install the base bundle -RUN set -eux; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - mkdir /opt/ibm/wlp/etc/; \ - echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ - installUtility install --acceptLicense baseBundle; \ - rm /opt/ibm/wlp/etc/repositories.properties; \ - elif [ -f /tmp/wlpRepo.zip ]; then \ - installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ - else \ - installUtility install --acceptLicense baseBundle; \ - fi; \ - rm -rf /output/workarea /output/logs; \ - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; - -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java8-ibmjava-ubi -FROM $PARENT_IMAGE -ARG VERBOSE=false - -# Copy the runtime -COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp - -COPY --chown=1001:0 server.xml /config/ - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk11 b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk11 deleted file mode 100644 index 6327e6463..000000000 --- a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk11 +++ /dev/null @@ -1,51 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java11-openj9-ubi -FROM $PARENT_IMAGE AS installBundle - -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -# If there is a local copy of the repository use that instead -COPY resources/ /tmp/ - -# Install the base bundle -RUN set -eux; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - mkdir /opt/ibm/wlp/etc/; \ - echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ - installUtility install --acceptLicense baseBundle; \ - rm /opt/ibm/wlp/etc/repositories.properties; \ - elif [ -f /tmp/wlpRepo.zip ]; then \ - installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ - else \ - installUtility install --acceptLicense baseBundle; \ - fi; \ - rm -rf /output/workarea /output/logs; \ - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; - -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java11-openj9-ubi -FROM $PARENT_IMAGE -ARG VERBOSE=false - -# Copy the runtime -COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp - -COPY --chown=1001:0 server.xml /config/ - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk17 b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk17 deleted file mode 100644 index 8a3db2b93..000000000 --- a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk17 +++ /dev/null @@ -1,51 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java17-openj9-ubi -FROM $PARENT_IMAGE AS installBundle - -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -# If there is a local copy of the repository use that instead -COPY resources/ /tmp/ - -# Install the base bundle -RUN set -eux; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - mkdir /opt/ibm/wlp/etc/; \ - echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ - installUtility install --acceptLicense baseBundle; \ - rm /opt/ibm/wlp/etc/repositories.properties; \ - elif [ -f /tmp/wlpRepo.zip ]; then \ - installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ - else \ - installUtility install --acceptLicense baseBundle; \ - fi; \ - rm -rf /output/workarea /output/logs; \ - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; - -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java17-openj9-ubi -FROM $PARENT_IMAGE -ARG VERBOSE=false - -# Copy the runtime -COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp - -COPY --chown=1001:0 server.xml /config/ - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk8 b/ga/23.0.0.6/full/Dockerfile.ubi.openjdk8 deleted file mode 100644 index 41abc3a15..000000000 --- a/ga/23.0.0.6/full/Dockerfile.ubi.openjdk8 +++ /dev/null @@ -1,51 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java8-openj9-ubi -FROM $PARENT_IMAGE AS installBundle - -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -# If there is a local copy of the repository use that instead -COPY resources/ /tmp/ - -# Install the base bundle -RUN set -eux; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - mkdir /opt/ibm/wlp/etc/; \ - echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ - installUtility install --acceptLicense baseBundle; \ - rm /opt/ibm/wlp/etc/repositories.properties; \ - elif [ -f /tmp/wlpRepo.zip ]; then \ - installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \ - else \ - installUtility install --acceptLicense baseBundle; \ - fi; \ - rm -rf /output/workarea /output/logs; \ - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; - -ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.6-kernel-java8-openj9-ubi -FROM $PARENT_IMAGE -ARG VERBOSE=false - -# Copy the runtime -COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp - -COPY --chown=1001:0 server.xml /config/ - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 deleted file mode 100644 index 9eb122917..000000000 --- a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 +++ /dev/null @@ -1,38 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava - -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -# Install the base bundle -RUN set -eux; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - mkdir /opt/ibm/wlp/etc/; \ - echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ - fi; \ - installUtility install --acceptLicense baseBundle; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - rm /opt/ibm/wlp/etc/repositories.properties; \ - fi; \ - rm -rf /output/workarea /output/logs; \ - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; - -COPY --chown=1001:0 server.xml /config/ - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 deleted file mode 100644 index b1097a11b..000000000 --- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 +++ /dev/null @@ -1,38 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM websphere-liberty:23.0.0.6-kernel-java11-openj9 - -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -# Install the base bundle -RUN set -eux; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - mkdir /opt/ibm/wlp/etc/; \ - echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ - fi; \ - installUtility install --acceptLicense baseBundle; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - rm /opt/ibm/wlp/etc/repositories.properties; \ - fi; \ - rm -rf /output/workarea /output/logs; \ - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; - -COPY --chown=1001:0 server.xml /config/ - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 deleted file mode 100644 index f6a03f276..000000000 --- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 +++ /dev/null @@ -1,38 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM websphere-liberty:23.0.0.6-kernel-java17-openj9 - -ARG VERBOSE=false -ARG REPOSITORIES_PROPERTIES="" - -# Install the base bundle -RUN set -eux; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - mkdir /opt/ibm/wlp/etc/; \ - echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \ - fi; \ - installUtility install --acceptLicense baseBundle; \ - if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \ - rm /opt/ibm/wlp/etc/repositories.properties; \ - fi; \ - rm -rf /output/workarea /output/logs; \ - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; - -COPY --chown=1001:0 server.xml /config/ - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx diff --git a/ga/23.0.0.6/full/README.md b/ga/23.0.0.6/full/README.md deleted file mode 100644 index 4292ed4c6..000000000 --- a/ga/23.0.0.6/full/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# WebSphere Application Server Developer Edition Liberty image - -The [Dockerfile.ubuntu.ibmjava8](Dockerfile.ubuntu.ibmjava8) in this directory is used to build the `websphere-liberty:full` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). The image contains IBM WebSphere Liberty with an extensive set of features for convenience. - -# Usage - -Instructions for using the image can be found on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). It is possible to build the image yourself by cloning this repository, changing to the `ga//full` directory and then issuing the command to build container image. For example, with Docker execute `docker build .`. diff --git a/ga/23.0.0.6/full/resources/.gitkeep b/ga/23.0.0.6/full/resources/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/ga/23.0.0.6/full/server.xml b/ga/23.0.0.6/full/server.xml deleted file mode 100644 index 9d0b33f75..000000000 --- a/ga/23.0.0.6/full/server.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - javaee-8.0 - microProfile-3.0 - - - - - - - - - - - - - - - - - - - diff --git a/ga/23.0.0.6/images.txt b/ga/23.0.0.6/images.txt deleted file mode 100644 index 1b343a17c..000000000 --- a/ga/23.0.0.6/images.txt +++ /dev/null @@ -1,18 +0,0 @@ -websphere-liberty:23.0.0.6-kernel ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.6-kernel-java11-openj9 ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.6-kernel-java17-openj9 ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.6-kernel-java8-ibmjava-ubi ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.6-kernel-java8-openj9-ubi ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.6-kernel-java11-openj9-ubi ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.6-kernel-java17-openj9-ubi ../ga/23.0.0.6/kernel ../ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk17 -websphere-liberty:23.0.0.6-full ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 -websphere-liberty:23.0.0.6-full-java11-openj9 ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 -websphere-liberty:23.0.0.6-full-java17-openj9 ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 -websphere-liberty:23.0.0.6-full-java8-ibmjava-ubi ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubi.ibmjava8 -websphere-liberty:23.0.0.6-full-java8-openj9-ubi ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubi.openjdk8 -websphere-liberty:23.0.0.6-full-java11-openj9-ubi ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubi.openjdk11 -websphere-liberty:23.0.0.6-full-java17-openj9-ubi ../ga/23.0.0.6/full ../ga/23.0.0.6/full/Dockerfile.ubi.openjdk17 -websphere-liberty:beta ../beta -websphere-liberty:test-stock-quote test-stock-quote -websphere-liberty:test-stock-trader test-stock-trader -websphere-liberty:test-pet-clinic test-pet-clinic diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 deleted file mode 100644 index 74d122601..000000000 --- a/ga/23.0.0.6/kernel/Dockerfile.ubi.ibmjava8 +++ /dev/null @@ -1,175 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM ibmjava:8-ubi AS getRuntime - -USER root - -ARG VERBOSE=false - -# Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -# If there is a local copy of the image use that instead -COPY resources/ /tmp/ - -RUN yum -y install unzip wget openssl \ - && yum clean all \ - && mkdir -p /licenses \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ - && chmod -R g+x /usr/bin \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && cp -a /opt/ibm/wlp/lafiles/. /licenses/ - -FROM ibmjava:8-ubi - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true - -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM's Java and Red Hat's UBI 8" \ - description="This image contains the WebSphere Liberty runtime with IBM's Java and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - -# Install dumb-init -RUN set -eux; \ - ARCH="$(uname -m)"; \ - case "${ARCH}" in \ - aarch64|arm64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ - DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ - ;; \ - amd64|x86_64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ - DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ - ;; \ - ppc64el|ppc64le) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ - DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ - ;; \ - s390x) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ - DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ - ;;\ - *) \ - echo "Unsupported arch: ${ARCH}"; \ - exit 1; \ - ;; \ - esac; \ - curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ - echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ - chmod +x /usr/bin/dumb-init; - -# Add default user 1001 and create wlp with right user/permissions before copying -RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ - && mkdir -p /opt/ibm/wlp \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp - -# Copy the runtime and licenses -COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp -COPY --from=getRuntime /licenses /licenses - -RUN yum -y install openssl \ - && yum clean all -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ - && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env - -COPY NOTICES /opt/ibm/NOTICES -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk11 deleted file mode 100644 index 9a1edc530..000000000 --- a/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk11 +++ /dev/null @@ -1,175 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime - -USER root - -ARG VERBOSE=false - -# Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -# If there is a local copy of the image use that instead -COPY resources/ /tmp/ - -RUN yum -y install shadow-utils unzip wget findutils openssl \ - && yum clean all \ - && mkdir -p /licenses \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ - && chmod -R g+x /usr/bin \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && cp -a /opt/ibm/wlp/lafiles/. /licenses/ - -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true - -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - -# Install dumb-init -RUN set -eux; \ - ARCH="$(uname -m)"; \ - case "${ARCH}" in \ - aarch64|arm64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ - DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ - ;; \ - amd64|x86_64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ - DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ - ;; \ - ppc64el|ppc64le) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ - DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ - ;; \ - s390x) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ - DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ - ;;\ - *) \ - echo "Unsupported arch: ${ARCH}"; \ - exit 1; \ - ;; \ - esac; \ - curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ - echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ - chmod +x /usr/bin/dumb-init; - -# Add default user 1001 and create wlp with right user/permissions before copying -RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ - && mkdir -p /opt/ibm/wlp \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp - -# Copy the runtime and licenses -COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp -COPY --from=getRuntime /licenses /licenses - -RUN yum -y install openssl \ - && yum clean all -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ - && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env - -COPY NOTICES /opt/ibm/NOTICES -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk17 deleted file mode 100644 index 2afe4dcd4..000000000 --- a/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk17 +++ /dev/null @@ -1,175 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime - -USER root - -ARG VERBOSE=false - -# Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -# If there is a local copy of the image use that instead -COPY resources/ /tmp/ - -RUN yum -y install shadow-utils unzip wget findutils openssl \ - && yum clean all \ - && mkdir -p /licenses \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ - && chmod -R g+x /usr/bin \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && cp -a /opt/ibm/wlp/lafiles/. /licenses/ - -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true - -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - -# Install dumb-init -RUN set -eux; \ - ARCH="$(uname -m)"; \ - case "${ARCH}" in \ - aarch64|arm64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ - DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ - ;; \ - amd64|x86_64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ - DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ - ;; \ - ppc64el|ppc64le) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ - DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ - ;; \ - s390x) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ - DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ - ;;\ - *) \ - echo "Unsupported arch: ${ARCH}"; \ - exit 1; \ - ;; \ - esac; \ - curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ - echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ - chmod +x /usr/bin/dumb-init; - -# Add default user 1001 and create wlp with right user/permissions before copying -RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ - && mkdir -p /opt/ibm/wlp \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp - -# Copy the runtime and licenses -COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp -COPY --from=getRuntime /licenses /licenses - -RUN yum -y install openssl \ - && yum clean all -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ - && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env - -COPY NOTICES /opt/ibm/NOTICES -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk8 deleted file mode 100644 index bd4740e22..000000000 --- a/ga/23.0.0.6/kernel/Dockerfile.ubi.openjdk8 +++ /dev/null @@ -1,175 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime - -USER root - -ARG VERBOSE=false - -# Install WebSphere Liberty -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -# If there is a local copy of the image use that instead -COPY resources/ /tmp/ - -RUN yum -y install shadow-utils unzip wget findutils openssl \ - && yum clean all \ - && mkdir -p /licenses \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && if [ ! -f /tmp/wlp.zip ]; then wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip; fi \ - && chmod -R g+x /usr/bin \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && cp -a /opt/ibm/wlp/lafiles/. /licenses/ - -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true - -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" \ - vendor="IBM" \ - name="IBM WebSphere Liberty" \ - version="$LIBERTY_VERSION" \ - summary="Image for WebSphere Liberty with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8" \ - description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Red Hat's UBI 8 as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - -# Install dumb-init -RUN set -eux; \ - ARCH="$(uname -m)"; \ - case "${ARCH}" in \ - aarch64|arm64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ - DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ - ;; \ - amd64|x86_64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ - DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ - ;; \ - ppc64el|ppc64le) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ - DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ - ;; \ - s390x) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ - DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ - ;;\ - *) \ - echo "Unsupported arch: ${ARCH}"; \ - exit 1; \ - ;; \ - esac; \ - curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ - echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ - chmod +x /usr/bin/dumb-init; - -# Add default user 1001 and create wlp with right user/permissions before copying -RUN adduser -u 1001 -r -g root -s /usr/sbin/nologin default \ - && mkdir -p /opt/ibm/wlp \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp - -# Copy the runtime and licenses -COPY --from=getRuntime --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp -COPY --from=getRuntime /licenses /licenses - -RUN yum -y install openssl \ - && yum clean all -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ - && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env - -COPY NOTICES /opt/ibm/NOTICES -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8 deleted file mode 100644 index 1b3b88a7e..000000000 --- a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.ibmjava8 +++ /dev/null @@ -1,156 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM ibmjava:8-jre - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true - -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - -# Install dumb-init -RUN set -eux; \ - apt-get update; \ - apt-get install -y curl; \ - ARCH="$(dpkg --print-architecture)"; \ - case "${ARCH}" in \ - aarch64|arm64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ - DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ - ;; \ - amd64|x86_64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ - DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ - ;; \ - ppc64el|ppc64le) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ - DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ - ;; \ - s390x) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ - DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ - ;;\ - *) \ - echo "Unsupported arch: ${ARCH}"; \ - exit 1; \ - ;; \ - esac; \ - curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ - echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ - chmod +x /usr/bin/dumb-init; \ - apt-get purge --auto-remove -y curl; \ - rm -rf /var/lib/apt/lists/*; - -# Install WebSphere Liberty -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" - -RUN apt-get update \ - && apt-get install -y --no-install-recommends unzip wget openssl \ - && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /licenses/ \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \ - && apt-get purge --auto-remove -y unzip \ - && apt-get purge --auto-remove -y wget \ - && rm -rf /var/lib/apt/lists/* - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ - && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env - -COPY NOTICES /opt/ibm/NOTICES -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11 deleted file mode 100644 index 968685e4b..000000000 --- a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk11 +++ /dev/null @@ -1,151 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM ibm-semeru-runtimes:open-11-jre-focal - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true - -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - -# Install dumb-init -RUN set -eux; \ - ARCH="$(dpkg --print-architecture)"; \ - case "${ARCH}" in \ - aarch64|arm64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ - DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ - ;; \ - amd64|x86_64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ - DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ - ;; \ - ppc64el|ppc64le) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ - DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ - ;; \ - s390x) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ - DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ - ;;\ - *) \ - echo "Unsupported arch: ${ARCH}"; \ - exit 1; \ - ;; \ - esac; \ - curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ - echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ - chmod +x /usr/bin/dumb-init; - -# Install WebSphere Liberty -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" -RUN apt-get update \ - && apt-get install -y --no-install-recommends unzip openssl wget \ - && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /licenses/ \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \ - && apt-get purge --auto-remove -y unzip \ - && apt-get purge --auto-remove -y wget \ - && rm -rf /var/lib/apt/lists/* - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ - && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env - -COPY NOTICES /opt/ibm/NOTICES -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17 deleted file mode 100644 index 6c75686c2..000000000 --- a/ga/23.0.0.6/kernel/Dockerfile.ubuntu.openjdk17 +++ /dev/null @@ -1,151 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM ibm-semeru-runtimes:open-17-jre-focal - -USER root - -ARG VERBOSE=false -ARG OPENJ9_SCC=true - -ARG LIBERTY_VERSION=23.0.0.6 -ARG LIBERTY_BUILD_LABEL=cl230620230612-1100 - -LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \ - org.opencontainers.image.vendor="IBM" \ - org.opencontainers.image.url="https://github.com/WASdev/ci.docker" \ - org.opencontainers.image.documentation="https://www.ibm.com/support/knowledgecenter/SSAW57_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/cwlp_about.html" \ - org.opencontainers.image.version="$LIBERTY_VERSION" \ - org.opencontainers.image.revision="$LIBERTY_BUILD_LABEL" \ - org.opencontainers.image.description="This image contains the WebSphere Liberty runtime with IBM Semeru Runtime Open Edition OpenJDK with OpenJ9 and Ubuntu as the base OS. For more information on this image please see https://ibm.biz/wl-app-image-template" \ - org.opencontainers.image.title="IBM WebSphere Liberty" - -ENV PATH=$PATH:/opt/ibm/wlp/bin:/opt/ibm/helpers/build - -# Add labels for consumption by IBM Product Insights -LABEL "ProductID"="fbf6a96d49214c0abc6a3bc5da6e48cd" \ - "ProductName"="WebSphere Application Server Liberty" \ - "ProductVersion"="$LIBERTY_VERSION" \ - "BuildLabel"="$LIBERTY_BUILD_LABEL" - -# Install dumb-init -RUN set -eux; \ - ARCH="$(dpkg --print-architecture)"; \ - case "${ARCH}" in \ - aarch64|arm64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_aarch64'; \ - DUMB_INIT_SHA256=b7d648f97154a99c539b63c55979cd29f005f88430fb383007fe3458340b795e; \ - ;; \ - amd64|x86_64) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64'; \ - DUMB_INIT_SHA256=e874b55f3279ca41415d290c512a7ba9d08f98041b28ae7c2acb19a545f1c4df; \ - ;; \ - ppc64el|ppc64le) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_ppc64le'; \ - DUMB_INIT_SHA256=3d15e80e29f0f4fa1fc686b00613a2220bc37e83a35283d4b4cca1fbd0a5609f; \ - ;; \ - s390x) \ - DUMB_INIT_URL='https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_s390x'; \ - DUMB_INIT_SHA256=47e4601b152fc6dcb1891e66c30ecc62a2939fd7ffd1515a7c30f281cfec53b7; \ - ;;\ - *) \ - echo "Unsupported arch: ${ARCH}"; \ - exit 1; \ - ;; \ - esac; \ - curl -LfsSo /usr/bin/dumb-init ${DUMB_INIT_URL}; \ - echo "${DUMB_INIT_SHA256} */usr/bin/dumb-init" | sha256sum -c -; \ - chmod +x /usr/bin/dumb-init; - -# Install WebSphere Liberty -ARG LIBERTY_URL -ARG DOWNLOAD_OPTIONS="" -RUN apt-get update \ - && apt-get install -y --no-install-recommends unzip openssl wget \ - && rm -rf /var/lib/apt/lists/* \ - && mkdir -p /licenses/ \ - && useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \ - && LIBERTY_URL=${LIBERTY_URL:-$(wget -q -O - https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/wasdev/downloads/wlp/index.yml | grep -E "^\s*kernel:.*${LIBERTY_VERSION}\.zip" | sed -n 's/\s*kernel:\s//p' | tr -d '\r' )} \ - && wget $DOWNLOAD_OPTIONS $LIBERTY_URL -U UA-IBM-WebSphere-Liberty-Docker -O /tmp/wlp.zip \ - && unzip -q /tmp/wlp.zip -d /opt/ibm \ - && rm /tmp/wlp.zip \ - && chown -R 1001:0 /opt/ibm/wlp \ - && chmod -R g+rw /opt/ibm/wlp \ - && cp -a /opt/ibm/wlp/lafiles/. /licenses/ \ - && apt-get purge --auto-remove -y unzip \ - && apt-get purge --auto-remove -y wget \ - && rm -rf /var/lib/apt/lists/* - -# Set Path Shortcuts -ENV LOG_DIR=/logs \ - WLP_OUTPUT_DIR=/opt/ibm/wlp/output \ - OPENJ9_SCC=$OPENJ9_SCC - -# Configure WebSphere Liberty -RUN /opt/ibm/wlp/bin/server create \ - && rm -rf $WLP_OUTPUT_DIR/.classCache /output/workarea \ - && rm -rf /opt/ibm/wlp/usr/servers/defaultServer/server.env - -COPY NOTICES /opt/ibm/NOTICES -COPY helpers/ /opt/ibm/helpers/ -COPY fixes/ /opt/ibm/fixes/ - -# Create symlinks && set permissions for non-root user -RUN mkdir /logs \ - && mkdir /etc/wlp \ - && mkdir -p /opt/ibm/wlp/usr/shared/resources/lib.index.cache \ - && mkdir -p /home/default \ - && mkdir /output \ - && chmod -t /output \ - && rm -rf /output \ - && ln -s $WLP_OUTPUT_DIR/defaultServer /output \ - && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \ - && ln -s /opt/ibm /liberty \ - && ln -s /opt/ibm/fixes /fixes \ - && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \ - && mkdir -p /config/configDropins/defaults \ - && mkdir -p /config/configDropins/overrides \ - && chown -R 1001:0 /config \ - && chmod -R g+rw /config \ - && chown -R 1001:0 /opt/ibm/helpers \ - && chmod -R g+rwx /opt/ibm/helpers \ - && chown -R 1001:0 /opt/ibm/fixes \ - && chmod -R g+rwx /opt/ibm/fixes \ - && chown -R 1001:0 /opt/ibm/wlp/usr \ - && chmod -R g+rw /opt/ibm/wlp/usr \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rw /opt/ibm/wlp/output \ - && chown -R 1001:0 /logs \ - && chmod -R g+rw /logs \ - && chown -R 1001:0 /etc/wlp \ - && chmod -R g+rw /etc/wlp \ - && chown -R 1001:0 /home/default \ - && chmod -R g+rw /home/default - -# Create a new SCC layer -RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \ - && rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \ - && chown -R 1001:0 /opt/ibm/wlp/output \ - && chmod -R g+rwx /opt/ibm/wlp/output - -# These settings are needed so that we can run as a different user than 1001 after server warmup -ENV RANDFILE=/tmp/.rnd \ - OPENJ9_JAVA_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal -Dosgi.checkConfiguration=false" - -USER 1001 - -EXPOSE 9080 9443 - -ENTRYPOINT ["/opt/ibm/helpers/runtime/docker-server.sh"] -CMD ["/opt/ibm/wlp/bin/server", "run", "defaultServer"] diff --git a/ga/23.0.0.6/kernel/NOTICES b/ga/23.0.0.6/kernel/NOTICES deleted file mode 100644 index 474e8d98e..000000000 --- a/ga/23.0.0.6/kernel/NOTICES +++ /dev/null @@ -1,72 +0,0 @@ -NOTICES AND INFORMATION - -IBM WebSphere Application Server Liberty @LIBERTY_VERSION@ - -The IBM license agreement and any applicable information on the web -download page for IBM products refers Licensee to this file for details -concerning notices applicable to code included in the products listed -above ("the Program"). - -Notwithstanding the terms and conditions of any other agreement Licensee -may have with IBM or any of its related or affiliated entities -(collectively "IBM"), the third party code identified below is subject -to the terms and conditions of the IBM license agreement for the Program -and not the license terms that may be contained in the notices below. -The notices are provided for informational purposes. - -Please note: This Notices file may identify information that is not used -by, or that was not shipped with, the Program as Licensee installed it. - -IMPORTANT: IBM does not represent or warrant that the information in this -NOTICES file is accurate. Third party websites are independent of IBM and -IBM does not represent or warrant that the information on any third party -website referenced in this NOTICES file is accurate. IBM disclaims any -and all liability for errors and omissions or for any damages accruing -from the use of this NOTICES file or its contents, including without -limitation URLs or references to any third party websites. - -TABLE OF CONTENTS - -THIS IBM NOTICES FILE CONSISTS OF THE FOLLOWING SECTIONS: -MIT - -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -MIT LICENSE - -The Program includes some or all of the following that IBM obtained -under the MIT License: - -DUMB_INIT Copyright (c) 2015 Yelp, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -END OF MIT LICENSE NOTICES AND INFORMATION -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -END OF NOTICES AND INFORMATION -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - - -END OF NOTICES AND INFORMATION FOR -IBM WebSphere Application Server Liberty @LIBERTY_VERSION@ -++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - - diff --git a/ga/23.0.0.6/kernel/README.md b/ga/23.0.0.6/kernel/README.md deleted file mode 100644 index 32ce7911c..000000000 --- a/ga/23.0.0.6/kernel/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# WebSphere Application Server Developer Edition Liberty kernel image - -The [Dockerfile.ubuntu.ibmjava8](Dockerfile.ubuntu.ibmjava8) in this directory is used to build the `websphere-liberty:kernel` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). The image contains IBM WebSphere Application Server Developer Edition Liberty Kernel and an IBM Java Runtime Environment. - -# Usage - -Instructions for using the image can be found on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). It is possible to build the image yourself by cloning this repository, changing to the `ga//kernel` directory and then issuing the command to build container image. For example, with Docker execute `docker build .`. - -**Note:** Refer to [Optional Enterprise Functionality](https://github.com/WASdev/ci.docker#optional-enterprise-functionality) to ensure certain features are enabled such as monitoring or SSL. diff --git a/ga/23.0.0.6/kernel/fixes/.gitkeep b/ga/23.0.0.6/kernel/fixes/.gitkeep deleted file mode 100644 index a282fd264..000000000 --- a/ga/23.0.0.6/kernel/fixes/.gitkeep +++ /dev/null @@ -1,2 +0,0 @@ -Place holder file to keep the fixes directory -in git even if there aren't any current ifixes. diff --git a/ga/23.0.0.6/kernel/helpers/build/checkpoint.sh b/ga/23.0.0.6/kernel/helpers/build/checkpoint.sh deleted file mode 100755 index dba7820ff..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/checkpoint.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# hack to bump up the pid by 100 -for i in {1..100} -do - pidplus.sh -done - -echo "Performing checkpoint --at=$1" -/opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1 - -rc=$? -exit $rc diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-client.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-client.xml deleted file mode 100644 index 61dddfce0..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-client.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - true - - - true - - - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml deleted file mode 100644 index 4dd8f8063..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-embedded.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - true - - - - - - - - - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml deleted file mode 100644 index ce9fa0d76..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml deleted file mode 100644 index db8dc6a47..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/hazelcast-sessioncache.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - sessionCache-1.0 - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/http-endpoint.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/http-endpoint.xml deleted file mode 100644 index 5f6c60552..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/http-endpoint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml deleted file mode 100644 index 2a2388a3c..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/http-ssl-endpoint.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml deleted file mode 100644 index a5b7d8a0c..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/iiop-endpoint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml deleted file mode 100644 index f8fea3c88..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/iiop-ssl-endpoint.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml deleted file mode 100644 index d835cb4e9..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache-config.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml deleted file mode 100644 index e2ec72d2c..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - sessionCache-1.0 - - - - - - - - - - - - - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/jms-endpoint.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/jms-endpoint.xml deleted file mode 100644 index a99b07165..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/jms-endpoint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml deleted file mode 100644 index d32a77ce7..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/jms-ssl-endpoint.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml deleted file mode 100644 index d4872b5ce..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/keystore.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/mp-health-check.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/mp-health-check.xml deleted file mode 100644 index 874559d63..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/mp-health-check.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - mpHealth-1.0 - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/mp-monitoring.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/mp-monitoring.xml deleted file mode 100644 index 4f5b0ce08..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/mp-monitoring.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - mpMetrics-1.1 - monitor-1.0 - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/oidc-config.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/oidc-config.xml deleted file mode 100644 index 976afbe4b..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/oidc-config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/oidc.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/oidc.xml deleted file mode 100644 index f044723be..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/oidc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - openidConnectClient-1.0 - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sessioncache-features.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sessioncache-features.xml deleted file mode 100644 index f7b5a4685..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sessioncache-features.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - sessionCache-1.0 - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-facebook.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-facebook.xml deleted file mode 100644 index 0c2d8aa42..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-facebook.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-features.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-features.xml deleted file mode 100644 index a26c00a58..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-features.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - appSecurity-2.0 - socialLogin-1.0 - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-github.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-github.xml deleted file mode 100644 index 1e96a50aa..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-github.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-google.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-google.xml deleted file mode 100644 index 50b40143f..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-google.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-linkedin.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-linkedin.xml deleted file mode 100644 index f608d5cbb..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-linkedin.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-oauth2.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-oauth2.xml deleted file mode 100644 index 783ce2d95..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-oauth2.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-oidc.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-oidc.xml deleted file mode 100644 index 530465305..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-oidc.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-twitter.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-twitter.xml deleted file mode 100644 index aedffbb50..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/sso-twitter.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/tls.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/tls.xml deleted file mode 100644 index 9d6838900..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/tls.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - transportSecurity-1.0 - - \ No newline at end of file diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/trustDefault.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/trustDefault.xml deleted file mode 100644 index 396987fad..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/trustDefault.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml b/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml deleted file mode 100644 index 3a32393d3..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configuration_snippets/truststore.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ga/23.0.0.6/kernel/helpers/build/configure.sh b/ga/23.0.0.6/kernel/helpers/build/configure.sh deleted file mode 100755 index b2480a5cd..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/configure.sh +++ /dev/null @@ -1,219 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020, 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Determine if featureUtility ran in an earlier build step -if /opt/ibm/helpers/build/internal/features-installed.sh; then - FEATURES_INSTALLED=true -else - FEATURES_INSTALLED=false -fi - -if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null -fi - -set -Eeox pipefail - -function main() { - ##Define variables for XML snippets source and target paths - WLP_INSTALL_DIR=/opt/ibm/wlp - SHARED_CONFIG_DIR=${WLP_INSTALL_DIR}/usr/shared/config - SHARED_RESOURCE_DIR=${WLP_INSTALL_DIR}/usr/shared/resources - - SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets - SNIPPETS_TARGET=/config/configDropins/overrides - SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults - mkdir -p ${SNIPPETS_TARGET} - mkdir -p ${SNIPPETS_TARGET_DEFAULTS} - - # Check for each Liberty value-add functionality - if [ "$FEATURES_INSTALLED" == "false" ]; then - # HTTP Endpoint - if [ "$HTTP_ENDPOINT" == "true" ]; then - if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/http-ssl-endpoint.xml $SNIPPETS_TARGET/http-ssl-endpoint.xml - else - cp $SNIPPETS_SOURCE/http-endpoint.xml $SNIPPETS_TARGET/http-endpoint.xml - fi - fi - - # MicroProfile Health - if [ "$MP_HEALTH_CHECK" == "true" ]; then - cp $SNIPPETS_SOURCE/mp-health-check.xml $SNIPPETS_TARGET/mp-health-check.xml - fi - - # MicroProfile Monitoring - if [ "$MP_MONITORING" == "true" ]; then - cp $SNIPPETS_SOURCE/mp-monitoring.xml $SNIPPETS_TARGET/mp-monitoring.xml - fi - - # IIOP Endpoint - if [ "$IIOP_ENDPOINT" == "true" ]; then - if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/iiop-ssl-endpoint.xml $SNIPPETS_TARGET/iiop-ssl-endpoint.xml - else - cp $SNIPPETS_SOURCE/iiop-endpoint.xml $SNIPPETS_TARGET/iiop-endpoint.xml - fi - fi - - # JMS Endpoint - if [ "$JMS_ENDPOINT" == "true" ]; then - if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/jms-ssl-endpoint.xml $SNIPPETS_TARGET/jms-ssl-endpoint.xml - else - cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml - fi - fi - - # OpenIdConnect Client - if [ "$OIDC" == "true" ] || [ "$OIDC_CONFIG" == "true" ]; then - cp $SNIPPETS_SOURCE/oidc.xml $SNIPPETS_TARGET/oidc.xml - fi - if [ "$OIDC_CONFIG" == "true" ]; then - cp $SNIPPETS_SOURCE/oidc-config.xml $SNIPPETS_TARGET/oidc-config.xml - fi - - # Infinispan Session Caching (Full) - if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then - cp ${SNIPPETS_SOURCE}/infinispan-client-sessioncache.xml ${SNIPPETS_TARGET}/infinispan-client-sessioncache.xml - chmod g+rw $SNIPPETS_TARGET/infinispan-client-sessioncache.xml - fi - - # Hazelcast Session Caching (Full) - if [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then - cp ${SNIPPETS_SOURCE}/hazelcast-sessioncache.xml ${SNIPPETS_TARGET}/hazelcast-sessioncache.xml - mkdir -p ${SHARED_CONFIG_DIR}/hazelcast - cp ${SNIPPETS_SOURCE}/hazelcast-${HZ_SESSION_CACHE}.xml ${SHARED_CONFIG_DIR}/hazelcast/hazelcast.xml - fi - - # SSO - if [[ -n "$SEC_SSO_PROVIDERS" ]]; then - cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS - fi - - # Key Store - if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/tls.xml $SNIPPETS_TARGET/tls.xml - fi - else - # Otherwise, load XML for addons that have features already installed - # Infinispan Session Caching - if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then - cp ${SNIPPETS_SOURCE}/infinispan-client-sessioncache-config.xml ${SNIPPETS_TARGET}/infinispan-client-sessioncache-config.xml - chmod g+rw $SNIPPETS_TARGET/infinispan-client-sessioncache-config.xml - fi - - # Hazelcast Session Caching - if [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then - cp ${SNIPPETS_SOURCE}/hazelcast-sessioncache-config.xml ${SNIPPETS_TARGET}/hazelcast-sessioncache-config.xml - mkdir -p ${SHARED_CONFIG_DIR}/hazelcast - cp ${SNIPPETS_SOURCE}/hazelcast-${HZ_SESSION_CACHE}.xml ${SHARED_CONFIG_DIR}/hazelcast/hazelcast.xml - fi - fi - - # Key Store - keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml" - if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]; then - if [ ! -e $keystorePath ]; then - # Generate the keystore.xml - export KEYSTOREPWD=$(openssl rand -base64 32) - sed "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml - chmod g+w $SNIPPETS_TARGET_DEFAULTS/keystore.xml - fi - fi - - # SSO - if [[ -n "$SEC_SSO_PROVIDERS" ]]; then - parseProviders $SEC_SSO_PROVIDERS - fi - - if [ "$SKIP_FEATURE_INSTALL" != "true" ] && [ "$FEATURES_INSTALLED" == "false" ]; then - # Install needed features - if [ "$FEATURE_REPO_URL" ]; then - curl -k --fail $FEATURE_REPO_URL > /tmp/repo.zip - installUtility install --acceptLicense defaultServer --from=/tmp/repo.zip || rc=$?; if [ $rc -ne 22 ]; then exit $rc; fi - rm -rf /tmp/repo.zip - else - installUtility install --acceptLicense defaultServer || rc=$?; if [ $rc -ne 22 ]; then exit $rc; fi - fi - fi - - # Apply interim fixes found in /opt/ibm/fixes - # Fixes recommended by IBM, such as to resolve security vulnerabilities, are also included in /opt/ibm/fixes - # Note: This step should be done once needed features are enabled and installed using installUtility. - - # Do not create a SCC - if [ -n "${IBM_JAVA_OPTIONS}" ]; then - IBM_JAVA_OPTIONS="${IBM_JAVA_OPTIONS} -Xshareclasses:none" - fi - - if [ -n "${OPENJ9_JAVA_OPTIONS}" ]; then - OPENJ9_JAVA_OPTIONS="${OPENJ9_JAVA_OPTIONS} -Xshareclasses:none" - fi - - find /opt/ibm/fixes -type f -name "*.jar" -print0 | sort -z | xargs -0 -n 1 -r -I {} java -jar {} --installLocation $WLP_INSTALL_DIR - #Make sure that group write permissions are set correctly after installing new features - find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw - - # Create a new SCC layer - if [ "$OPENJ9_SCC" == "true" ]; then - cmd="populate_scc.sh -i 1" - if [ "$TRIM_SCC" == "false" ]; then - cmd+=" -d" - fi - if [ ! "$SCC_SIZE" = "" ]; then - cmd+=" -s $SCC_SIZE" - fi - eval $cmd - fi -} - -## parse provider list to generate files into configDropins -function parseProviders() { - while [ $# -gt 0 ]; do - case "$1" in - oidc:*) - parseCommaList oidc "${1#*:}" - ;; - oauth2:*) - parseCommaList oauth2 "${1#*:}" - ;; - *) - if [[ $(ls $SNIPPETS_SOURCE | grep "$1") ]]; then - cp $SNIPPETS_SOURCE/sso-${1}.xml $SNIPPETS_TARGET_DEFAULTS - fi - ;; - esac - shift - done -} - -## process the comma delimitted oauth2/oidc source lists -function parseCommaList() { - local type="$1" - local list=$(echo "$2" | tr , " ") - - for current in ${list}; do - if [[ "${type}" = "oidc" ]]; then - # replace oidc identifiers with custom name - sed -e 's/=\"oidc/=\"'${current}'/g' -e 's/_OIDC_/_'${current^^}'_/g' $SNIPPETS_SOURCE/sso-oidc.xml > $SNIPPETS_TARGET_DEFAULTS/sso-${current}.xml - else - # replace oauth2 identifiers with custom name - sed -e 's/=\"oauth2/=\"'${current}'/g' -e 's/_OAUTH2_/_'${current^^}'_/g' $SNIPPETS_SOURCE/sso-oauth2.xml > $SNIPPETS_TARGET_DEFAULTS/sso-${current}.xml - fi - done -} - -main "$@" diff --git a/ga/23.0.0.6/kernel/helpers/build/features.sh b/ga/23.0.0.6/kernel/helpers/build/features.sh deleted file mode 100755 index 4e6654898..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/features.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null -fi - -set -Eeox pipefail - -##Define variables for XML snippets source and target paths -SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets -SNIPPETS_TARGET=/config/configDropins/overrides -SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults -mkdir -p ${SNIPPETS_TARGET} -mkdir -p ${SNIPPETS_TARGET_DEFAULTS} - -# Session Caching -if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] || [ "${HZ_SESSION_CACHE}" == "embedded" ]; then - cp ${SNIPPETS_SOURCE}/sessioncache-features.xml ${SNIPPETS_TARGET}/sessioncache-features.xml - chmod g+rw $SNIPPETS_TARGET/sessioncache-features.xml -fi - -# SSO -if [[ -n "$SEC_SSO_PROVIDERS" ]]; then - cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS -fi - -# Key Store -if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then - cp $SNIPPETS_SOURCE/tls.xml $SNIPPETS_TARGET/tls.xml -fi - -# Install necessary features using featureUtility -featureUtility installServerFeatures --acceptLicense defaultServer --noCache -find /opt/ibm/wlp/lib /opt/ibm/wlp/bin ! -perm -g=rw -print0 | xargs -0 -r chmod g+rw - -echo "features.sh script has been run" > /logs/features.log diff --git a/ga/23.0.0.6/kernel/helpers/build/infinispan-client-setup.sh b/ga/23.0.0.6/kernel/helpers/build/infinispan-client-setup.sh deleted file mode 100755 index cf54d05df..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/infinispan-client-setup.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null -fi - -set -Eeox pipefail - -yum update -y -yum install -y maven -mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan -echo ' 4.0.0 io.openliberty openliberty-infinispan-client 1.0 org.infinispan infinispan-jcache-remote 10.1.3.Final ' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml -mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false -mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan -yum remove -y maven -rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml -rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/jboss-transaction-api*.jar -rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/reactive-streams-*.jar -rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/rxjava-*.jar -rm -rf ~/.m2 -chown -R 1001:0 /opt/ibm/wlp/usr/shared/resources/infinispan -chmod -R g+rw /opt/ibm/wlp/usr/shared/resources/infinispan - diff --git a/ga/23.0.0.6/kernel/helpers/build/internal/features-installed.sh b/ga/23.0.0.6/kernel/helpers/build/internal/features-installed.sh deleted file mode 100755 index c32ac59f4..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/internal/features-installed.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ -f "/logs/features.log" ]; then - rm /logs/features.log - exit 0 -fi - ->&2 echo "WARNING: This is not an optimal build configuration. Although features in server.xml will continue to be installed correctly, the 'RUN features.sh' command should be added to the Dockerfile prior to configure.sh. See https://ibm.biz/wl-app-image-template for a sample application image template." -exit 1 diff --git a/ga/23.0.0.6/kernel/helpers/build/pidplus.sh b/ga/23.0.0.6/kernel/helpers/build/pidplus.sh deleted file mode 100755 index ad8007957..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/pidplus.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# hack to bump up the pid -echo "nothing" > /dev/null - - diff --git a/ga/23.0.0.6/kernel/helpers/build/populate_scc.sh b/ga/23.0.0.6/kernel/helpers/build/populate_scc.sh deleted file mode 100755 index 3c07a4e92..000000000 --- a/ga/23.0.0.6/kernel/helpers/build/populate_scc.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -if [ "$VERBOSE" != "true" ]; then - exec &>/dev/null -fi - -set -Eeox pipefail - -# 32-bit JVMs don't supported multi-layered SCCs. -[ -e "$JAVA_HOME/lib/i386" -o -e "$JAVA_HOME/lib/ppc" -o -e "$JAVA_HOME/lib/s390" ] && exit 0 - -SCC_SIZE="80m" # Default size of the SCC layer. -ITERATIONS=2 # Number of iterations to run to populate it. -TRIM_SCC=yes # Trim the SCC to eliminate any wasted space. - -# If this directory exists and has at least ug=rwx permissions, assume the base image includes an SCC called 'openj9_system_scc' and build on it. -# If not, build on our own SCC. -if [[ -d "/opt/java/.scc" ]] && [[ `stat -L -c "%a" "/opt/java/.scc" | cut -c 1,2` == "77" ]] -then - SCC="-Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc" -else - SCC="-Xshareclasses:name=liberty,cacheDir=/output/.classCache" -fi - -# For JDK8, as of OpenJ9 0.20.0 the criteria for determining the max heap size (-Xmx) has changed -# and the JVM has freedom to choose larger max heap sizes. -# Currently in compressedrefs mode there is a dependency between heap size and position and the AOT code stored in the -# SCC, such that if the max heap size/position changes too drastically the AOT code in the SCC becomes invalid and will -# not be loaded. Also, new AOT code will not be generated. -# In order to reduce the chances of this happening we use the -XX:+OriginalJDK8HeapSizeCompatibilityMode -# option to revert to the old criteria, which results in AOT code that is more compatible, on average, with typical heap sizes/positions. -# The option has no effect on later JDKs. -export OPENJ9_JAVA_OPTIONS="-XX:+OriginalJDK8HeapSizeCompatibilityMode $SCC" -export IBM_JAVA_OPTIONS="$OPENJ9_JAVA_OPTIONS" -CREATE_LAYER="$OPENJ9_JAVA_OPTIONS,createLayer,groupAccess" -DESTROY_LAYER="$OPENJ9_JAVA_OPTIONS,destroy" -PRINT_LAYER_STATS="$OPENJ9_JAVA_OPTIONS,printTopLayerStats" - -while getopts ":i:s:tdh" OPT -do - case "$OPT" in - i) - ITERATIONS="$OPTARG" - ;; - s) - [ "${OPTARG: -1}" == "m" ] || ( echo "Missing m suffix." && exit 1 ) - SCC_SIZE="$OPTARG" - ;; - t) - TRIM_SCC=yes - ;; - d) - TRIM_SCC=no - ;; - h) - echo \ -"Usage: $0 [-i iterations] [-s size] [-t] [-d] - -i Number of iterations to run to populate the SCC. (Default: $ITERATIONS) - -s Size of the SCC in megabytes (m suffix required). (Default: $SCC_SIZE) - -t Trim the SCC to eliminate most of the free space, if any. - -d Don't trim the SCC. - - Trimming enabled=$TRIM_SCC" - exit 1 - ;; - \?) - echo "Unrecognized option: $OPTARG" 1>&2 - exit 1 - ;; - :) - echo "Missing argument for option: $OPTARG" 1>&2 - exit 1 - ;; - esac -done - -OLD_UMASK=`umask` -umask 002 # 002 is required to provide group rw permission to the cache when `-Xshareclasses:groupAccess` options is used - -# Explicity create a class cache layer for this image layer here rather than allowing -# `server start` to do it, which will lead to problems because multiple JVMs will be started. -java $CREATE_LAYER -Xscmx$SCC_SIZE -version - -if [ $TRIM_SCC == yes ] -then - echo "Calculating SCC layer upper bound, starting with initial size $SCC_SIZE." - # Populate the newly created class cache layer. - /opt/ibm/wlp/bin/server start - /opt/ibm/wlp/bin/server stop - # Find out how full it is. - FULL=`( java $PRINT_LAYER_STATS || true ) 2>&1 | awk '/^Cache is [0-9.]*% .*full/ {print substr($3, 1, length($3)-1)}'` - echo "SCC layer is $FULL% full. Destroying layer." - # Destroy the layer once we know roughly how much space we need. - java $DESTROY_LAYER || true - # Remove the m suffix. - SCC_SIZE="${SCC_SIZE:0:-1}" - # Calculate the new size based on how full the layer was (rounded to nearest m). - SCC_SIZE=`awk "BEGIN {print int($SCC_SIZE * $FULL / 100.0 + 0.5)}"` - # Make sure size is >0. - [ $SCC_SIZE -eq 0 ] && SCC_SIZE=1 - # Add the m suffix back. - SCC_SIZE="${SCC_SIZE}m" - echo "Re-creating layer with size $SCC_SIZE." - # Recreate the layer with the new size. - java $CREATE_LAYER -Xscmx$SCC_SIZE -version -fi - -# Populate the newly created class cache layer. -# Server start/stop to populate the /output/workarea and make subsequent server starts faster. -for ((i=0; i<$ITERATIONS; i++)) -do - /opt/ibm/wlp/bin/server start - /opt/ibm/wlp/bin/server stop -done - -# restore umask -umask ${OLD_UMASK} - -rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /output/workarea - -if [[ -d "/output/resources" ]] -then - chmod -R g+rwx /output/resources -fi - -# Tell the user how full the final layer is. -FULL=`( java $PRINT_LAYER_STATS || true ) 2>&1 | awk '/^Cache is [0-9.]*% .*full/ {print substr($3, 1, length($3)-1)}'` -echo "SCC layer is $FULL% full." diff --git a/ga/23.0.0.6/kernel/helpers/runtime/docker-server.sh b/ga/23.0.0.6/kernel/helpers/runtime/docker-server.sh deleted file mode 100755 index 77f7b4260..000000000 --- a/ga/23.0.0.6/kernel/helpers/runtime/docker-server.sh +++ /dev/null @@ -1,159 +0,0 @@ -#!/bin/bash -# (C) Copyright IBM Corporation 2020. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -function importKeyCert() { - local CERT_FOLDER="${TLS_DIR:-/etc/x509/certs}" - local CRT_FILE="tls.crt" - local KEY_FILE="tls.key" - local CA_FILE="ca.crt" - local PASSWORD=$(openssl rand -base64 32 2>/dev/null) - local TRUSTSTORE_PASSWORD=$(openssl rand -base64 32 2>/dev/null) - local TMP_CERT=ca-bundle-temp.crt - local -r CRT_DELIMITER="/-----BEGIN CERTIFICATE-----/" - local KUBE_SA_FOLDER="/var/run/secrets/kubernetes.io/serviceaccount" - local KEYSTORE_FILE="/output/resources/security/key.p12" - local TRUSTSTORE_FILE="/output/resources/security/trust.p12" - - # Import the private key and certificate into new keytore - if [ -f "${CERT_FOLDER}/${KEY_FILE}" ] && [ -f "${CERT_FOLDER}/${CRT_FILE}" ]; then - echo "Found mounted TLS certificates, generating keystore" - mkdir -p /output/resources/security - if [ -f "${CERT_FOLDER}/${CA_FILE}" ]; then - openssl pkcs12 -export \ - -name "defaultKeyStore" \ - -inkey "${CERT_FOLDER}/${KEY_FILE}" \ - -in "${CERT_FOLDER}/${CRT_FILE}" \ - -certfile "${CERT_FOLDER}/${CA_FILE}" \ - -out "${KEYSTORE_FILE}" \ - -password pass:"${PASSWORD}" >&/dev/null - else - openssl pkcs12 -export \ - -name "defaultKeyStore" \ - -inkey "${CERT_FOLDER}/${KEY_FILE}" \ - -in "${CERT_FOLDER}/${CRT_FILE}" \ - -out "${KEYSTORE_FILE}" \ - -password pass:"${PASSWORD}" >&/dev/null - fi - - # Since we are creating new keystore, always write new password to a file - sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml - - # Add mounted CA to the truststore - if [ -f "${CERT_FOLDER}/${CA_FILE}" ]; then - echo "Found mounted TLS CA certificate, adding to truststore" - keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FOLDER}/${CA_FILE}" \ - -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-ca" >&/dev/null - fi - fi - - # Add kubernetes CA certificates to the truststore - # CA bundles need to be split and added as individual certificates - if [ "$SEC_IMPORT_K8S_CERTS" = "true" ] && [ -d "${KUBE_SA_FOLDER}" ]; then - mkdir /tmp/certs - pushd /tmp/certs >&/dev/null - cat ${KUBE_SA_FOLDER}/*.crt >${TMP_CERT} - csplit -s -z -f crt- "${TMP_CERT}" "${CRT_DELIMITER}" '{*}' - for CERT_FILE in crt-*; do - keytool -import -storetype pkcs12 -noprompt -keystore "${TRUSTSTORE_FILE}" -file "${CERT_FILE}" \ - -storepass "${TRUSTSTORE_PASSWORD}" -alias "service-sa-${CERT_FILE}" >&/dev/null - done - popd >&/dev/null - rm -rf /tmp/certs - fi - - # Add the keystore password to server configuration - if [ ! -e $keystorePath ]; then - sed "s|REPLACE|$PASSWORD|g" $SNIPPETS_SOURCE/keystore.xml > $SNIPPETS_TARGET_DEFAULTS/keystore.xml - fi - if [ -e $TRUSTSTORE_FILE ]; then - sed "s|PWD_TRUST|$TRUSTSTORE_PASSWORD|g" $SNIPPETS_SOURCE/truststore.xml > $SNIPPETS_TARGET_OVERRIDES/truststore.xml - elif [ ! -z $SEC_TLS_TRUSTDEFAULTCERTS ]; then - cp $SNIPPETS_SOURCE/trustDefault.xml $SNIPPETS_TARGET_OVERRIDES/trustDefault.xml - fi -} - -case "${LICENSE,,}" in - "accept" ) # Suppress license message in logs - grep -s -F "com.ibm.ws.logging.hideMessage" /config/bootstrap.properties \ - && sed -i 's/^\(com.ibm.ws.logging.hideMessage=.*$\)/\1,CWWKE0100I/' /config/bootstrap.properties \ - || echo "com.ibm.ws.logging.hideMessage=CWWKE0100I" >> /config/bootstrap.properties - ;; - "view" ) # Display license file - cat /opt/ibm/wlp/lafiles/LI_${LANG:-en} - exit 1 - ;; - "" ) # Continue, displaying license message in logs - true - ;; - *) # License not accepted - echo -e "Set environment variable LICENSE=accept to indicate acceptance of license terms and conditions.\n\nLicense agreements and information can be viewed by running this image with the environment variable LICENSE=view. You can also set the LANG environment variable to view the license in a different language." - exit 1 - ;; -esac - -SNIPPETS_SOURCE=/opt/ibm/helpers/build/configuration_snippets -SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults -SNIPPETS_TARGET_OVERRIDES=/config/configDropins/overrides - -keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml" - -importKeyCert - -# Infinispan Session Caching -if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then - echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}" - INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g') - echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}" - - if [[ -z "$INFINISPAN_HOST" ]]; then - eval INFINISPAN_HOST=\$${INFINISPAN_SERVICE_NAME}_SERVICE_HOST - export INFINISPAN_HOST - fi - echo "INFINISPAN_HOST: ${INFINISPAN_HOST}" - - if [[ -z "$INFINISPAN_PORT" ]]; then - eval INFINISPAN_PORT=\$${INFINISPAN_SERVICE_NAME}_SERVICE_PORT - export INFINISPAN_PORT - fi - echo "INFINISPAN_PORT: ${INFINISPAN_PORT:=11222}" - - if [[ -z "$INFINISPAN_USER" ]]; then - export INFINISPAN_USER=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 username | sed 's/username://' | sed 's/[[:space:]]*//g' | sed 's/^-//') - fi - echo "INFINISPAN_USER: ${INFINISPAN_USER:=developer}" - - if [[ -z "$INFINISPAN_PASS" ]]; then - export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g') - fi - echo "INFINISPAN_PASS: ${INFINISPAN_PASS}" -fi - - -# Pass on to the real server run -if [ -d "/output/workarea/checkpoint/image" ]; then - # A checkpoint image found; exec dumb-init for signal handling. - # Use of dumb-init for PID 1 is required for signal handling because - # the restored server process cannot be PID 1. - exec dumb-init --rewrite 15:2 -- /opt/ibm/helpers/runtime/restore-server.sh "$@" -elif [[ ! -z "$WLP_CHECKPOINT" ]]; then - # Unset WLP_CHECKPOINT so it is not set in the final image after checkpoint. - TMP_CHECKPOINT=$WLP_CHECKPOINT - unset WLP_CHECKPOINT - # A checkpoint action has been requested; run the checkpoint.sh script. - checkpoint.sh "$TMP_CHECKPOINT" -else - # The default is to just exec the supplied CMD - exec "$@" -fi diff --git a/ga/23.0.0.6/kernel/helpers/runtime/restore-server.sh b/ga/23.0.0.6/kernel/helpers/runtime/restore-server.sh deleted file mode 100755 index cdcd84894..000000000 --- a/ga/23.0.0.6/kernel/helpers/runtime/restore-server.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -# For restore use a copy of criu that does not have sys_ptrace -export CRIU_RESTORE_PATH=/opt/criu/criu -exec "$@" - diff --git a/ga/23.0.0.6/kernel/resources/.gitkeep b/ga/23.0.0.6/kernel/resources/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/ga/23.0.0.6/oidcProvider/Dockerfile b/ga/23.0.0.6/oidcProvider/Dockerfile deleted file mode 100644 index b98aa0de5..000000000 --- a/ga/23.0.0.6/oidcProvider/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM websphere-liberty:kernel - -ARG REPOSITORIES_PROPERTIES="" - -RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \ - && echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; fi \ - && installUtility install --acceptLicense \ - appSecurity-2.0 ldapRegistry-3.0 \ - localConnector-1.0 \ - samlWeb-2.0 \ - openidConnectServer-1.0 \ - socialLogin-1.0 \ - openidConnectClient-1.0 \ - && if [ ! -z $REPOSITORIES_PROPERTIES ]; then rm /opt/ibm/wlp/etc/repositories.properties; fi \ - && rm -rf /output/workarea /output/logs \ - && chmod -R g+rwx /opt/ibm/wlp/output/* - -COPY --chown=1001:0 server.xml /config/ diff --git a/ga/23.0.0.6/oidcProvider/Dockerfile.java11 b/ga/23.0.0.6/oidcProvider/Dockerfile.java11 deleted file mode 100644 index e722d7d7f..000000000 --- a/ga/23.0.0.6/oidcProvider/Dockerfile.java11 +++ /dev/null @@ -1,32 +0,0 @@ -# (C) Copyright IBM Corporation 2023. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM websphere-liberty:kernel-java11 - -ARG REPOSITORIES_PROPERTIES="" - -RUN if [ ! -z $REPOSITORIES_PROPERTIES ]; then mkdir /opt/ibm/wlp/etc/ \ - && echo $REPOSITORIES_PROPERTIES > /opt/ibm/wlp/etc/repositories.properties; fi \ - && installUtility install --acceptLicense \ - appSecurity-2.0 ldapRegistry-3.0 \ - localConnector-1.0 \ - samlWeb-2.0 \ - openidConnectServer-1.0 \ - socialLogin-1.0 \ - openidConnectClient-1.0 \ - && if [ ! -z $REPOSITORIES_PROPERTIES ]; then rm /opt/ibm/wlp/etc/repositories.properties; fi \ - && rm -rf /output/workarea /output/logs \ - && chmod -R g+rwx /opt/ibm/wlp/output/* - -COPY --chown=1001:0 server.xml /config/ diff --git a/ga/23.0.0.6/oidcProvider/README.md b/ga/23.0.0.6/oidcProvider/README.md deleted file mode 100644 index 52d2c87f5..000000000 --- a/ga/23.0.0.6/oidcProvider/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# WebSphere Application Server Developer Edition Liberty image - -The [Dockerfile](Dockerfile) in this directory is used to build the `websphere-liberty:oidcProvider` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). - -# Usage - -TODO diff --git a/ga/23.0.0.6/oidcProvider/server.xml b/ga/23.0.0.6/oidcProvider/server.xml deleted file mode 100644 index 5b94ec95b..000000000 --- a/ga/23.0.0.6/oidcProvider/server.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - openidConnectServer-1.0 - ldapRegistry-3.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - regexp:https://${env.OIDCP_INGRESS_HOST_REGEX}:3!d!d!d!d/oidcclient/redirect/rp - https://${env.OIDCP_INGRESS_HOST}/oidcclient/redirect/rp - - - - ${env.OIDCP_CUSTOM_CLIENT_REDIRECT} - - - - - - - - - - - - - - - - - - - - - - - - - - -