Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
72 changes: 72 additions & 0 deletions create-new-release.sh
Original file line number Diff line number Diff line change
@@ -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.";
18 changes: 0 additions & 18 deletions ga/23.0.0.10/images.txt

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-java17-openj9
FROM websphere-liberty:23.0.0.11-kernel-java17-openj9

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
File renamed without changes.
File renamed without changes.
18 changes: 18 additions & 0 deletions ga/23.0.0.11/images.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ USER root
ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""

Expand All @@ -45,8 +45,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ USER root
ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""

Expand All @@ -45,8 +45,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down Expand Up @@ -154,6 +154,7 @@ RUN mkdir /logs \
&& chmod -R g+rw /logs \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& chown -R 1001:0 /home/default \
&& chmod -R g+rw /home/default

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ USER root
ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""

Expand All @@ -45,8 +45,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down Expand Up @@ -154,6 +154,7 @@ RUN mkdir /logs \
&& chmod -R g+rw /logs \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& chown -R 1001:0 /home/default \
&& chmod -R g+rw /home/default

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ USER root
ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""

Expand All @@ -45,8 +45,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down Expand Up @@ -154,6 +154,7 @@ RUN mkdir /logs \
&& chmod -R g+rw /logs \
&& chown -R 1001:0 /etc/wlp \
&& chmod -R g+rw /etc/wlp \
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
&& chown -R 1001:0 /home/default \
&& chmod -R g+rw /home/default

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=23.0.0.10
ARG LIBERTY_BUILD_LABEL=cl231020231002-1201
ARG LIBERTY_VERSION=23.0.0.11
ARG LIBERTY_BUILD_LABEL=cl231120231030-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,23 @@ do
pidplus.sh
done

if [ -e /etc/instanton.ld.so.cache ]; then
cp /etc/instanton.ld.so.cache /etc/ld.so.cache
fi

ARCH="$(uname -m)";
case "${ARCH}" in
ppc64el|ppc64le)
export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
;;
s390x)
export JVM_ARGS="${JVM_ARGS} -XX:+JVMPortableRestoreMode"
;;
*)
;;
esac;


echo "Performing checkpoint --at=$1"
/opt/ibm/wlp/bin/server checkpoint defaultServer --at=$1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
if [ "$VERBOSE" != "true" ]; then
exec &>/dev/null
exec >/dev/null
fi

set -Eeox pipefail
Expand Down
2 changes: 1 addition & 1 deletion ga/23.0.0.6/kernel/helpers/build/features.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
if [ "$VERBOSE" != "true" ]; then
exec &>/dev/null
exec >/dev/null
fi

set -Eeox pipefail
Expand Down
Loading