Merge pull request #569 from WASdev/main

Merge main into vNext

Author: leochr

.github/workflows/update_files_for_release.yml

@@ -0,0 +1,62 @@
+# This workflow is triggered by manual inputs.
+
+name: Update files for the new release
+
+on:
+  workflow_dispatch:
+    inputs:
+      OLD_VERSION:
+        description: 'Enter old version'
+        # Show defaults as examples so user enters correct format.
+        default: '23.0.0.11'
+        required: true
+        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 workflow environment
+      run: echo "🔎 This workflow is running in branch ${{ github.ref }} and repository ${{ github.repository }}."
+
+    # This repository and branch to clone and checkout on runner 
+    # could be different than repo and branch where workflow runs.
+    # Be aware of this nuance.
+    - name: Check out repository code to runner
+      uses: actions/checkout@v4
+      with:
+        ref: vNext
+        repository: WASdev/ci.docker
+
+    - name: Run update script
+      run: bash ./create-new-release.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/* ${{ github.workspace }}/.travis.yml'
+        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 }}."

docs/icr-images.md

@@ -1,9 +1,9 @@
 
 # IBM Container Registry (ICR)
 
-WebSphere Liberty container images are available from IBM Container Registry (ICR) at `icr.io/appcafe/websphere-liberty`. Our recommendation is to use ICR instead of Docker Hub, since ICR doesn't impose rate limits on image pulls. Images can be pulled from ICR without authentication. Only images with Universal Base Image (UBI) as the Operating System are available in ICR at the moment.
+WebSphere Liberty container images are available from the IBM Container Registry (ICR) at `icr.io/appcafe/websphere-liberty`. Our recommendation is to use ICR instead of Docker Hub since ICR doesn't impose rate limits on image pulls. Images can be pulled from ICR without authentication. Only images with Universal Base Image (UBI) as the Operating System are available in ICR.
 
-The images for the latest release and the last two quarterly releases are available and are refreshed regularly.
+The images for the latest Liberty release and the last two quarterly releases (versions ending in _.3_, _.6_, _.9_ and _.12_) are available and are refreshed regularly to include fixes for the operating system (OS) and Java.
 
 Available image tags are listed below. The tags follow this naming convention: 
 ```
@@ -22,7 +22,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty
 ```
 
 
-## Latest version
+## Latest version (23.0.0.11)
 
 ```
 kernel-java8-openj9-ubi
@@ -36,6 +36,20 @@ full-java11-openj9-ubi
 full-java17-openj9-ubi
 ```
 
+## 23.0.0.11
+
+```
+23.0.0.11-kernel-java8-openj9-ubi
+23.0.0.11-kernel-java8-ibmjava-ubi
+23.0.0.11-kernel-java11-openj9-ubi
+23.0.0.11-kernel-java17-openj9-ubi
+
+23.0.0.11-full-java8-openj9-ubi
+23.0.0.11-full-java8-ibmjava-ubi
+23.0.0.11-full-java11-openj9-ubi
+23.0.0.11-full-java17-openj9-ubi
+```
+
 ## 23.0.0.9
 
 ```