Merge pull request #566 from WASdev/vNext

Merge vNext (23.0.0.11) changes into main

Author: leochr

.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.10
+  - RELEASE=../ga/23.0.0.11
   - RELEASE=../ga/latest
 
 script:

create-new-release.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+echo "Hello from the create-new-release.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
+
+# Update the .travis.yml file.
+sed -i'.bak' -e "s/RELEASE=\.\.\/ga\/$OLD_VERSION/RELEASE=\.\.\/ga\/$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;
+
+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.";

ga/23.0.0.10/images.txt

@@ -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.10-kernel-java8-ibmjava-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-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.10-kernel-java8-ibmjava-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/23.0.0.10/README.md ga/23.0.0.11/README.mdga/23.0.0.10/README.md renamed to ga/23.0.0.11/README.md

@@ -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.10-kernel-java11-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-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.10-kernel-java11-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 ga/23.0.0.11/full/Dockerfile.ubi.ibmjava8ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8 renamed to ga/23.0.0.11/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.10-kernel-java17-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-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.10-kernel-java17-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

…/23.0.0.10/full/Dockerfile.ubi.openjdk11 …/23.0.0.11/full/Dockerfile.ubi.openjdk11ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 renamed to ga/23.0.0.11/full/Dockerfile.ubi.openjdk11 ga/23.0.0.10/full/Dockerfile.ubi.openjdk11 renamed to ga/23.0.0.11/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.10-kernel-java8-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-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.10-kernel-java8-openj9-ubi
+ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:23.0.0.11-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

…/23.0.0.10/full/Dockerfile.ubi.openjdk17 …/23.0.0.11/full/Dockerfile.ubi.openjdk17ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 renamed to ga/23.0.0.11/full/Dockerfile.ubi.openjdk17 ga/23.0.0.10/full/Dockerfile.ubi.openjdk17 renamed to ga/23.0.0.11/full/Dockerfile.ubi.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.10-kernel-java8-ibmjava
+FROM websphere-liberty:23.0.0.11-kernel-java8-ibmjava
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""

ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 ga/23.0.0.11/full/Dockerfile.ubi.openjdk8ga/23.0.0.10/full/Dockerfile.ubi.openjdk8 renamed to ga/23.0.0.11/full/Dockerfile.ubi.openjdk8

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:23.0.0.10-kernel-java11-openj9
+FROM websphere-liberty:23.0.0.11-kernel-java11-openj9
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""