Skip to content

Commit e390fb9

Browse files
authored
Merge pull request #611 from WASdev/24.0.0.5-release
Updates for the release of 24.0.0.5
2 parents 43a6079 + 38c4767 commit e390fb9

File tree

80 files changed

+90
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+90
-115
lines changed

.github/workflows/update_files_for_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
default_author: github_actions
4646
author_name: GitHub Actions
4747
message: "Updates for the release of ${{ inputs.NEW_VERSION }}"
48-
add: '${{ github.workspace }}/ga/* ${{ github.workspace }}/.travis.yml'
48+
add: '${{ github.workspace }}/ga/*'
4949
new_branch: "${{ inputs.NEW_VERSION }}-release"
5050
push: true
5151
tag_push: '--force'

.travis.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 1 deletion

create-new-release.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do
4949

5050
done
5151

52-
# Update the .travis.yml file.
53-
sed -i'.bak' -e "s/RELEASE=\.\.\/ga\/$OLD_VERSION/RELEASE=\.\.\/ga\/$NEW_VERSION/" ./.travis.yml;
54-
rm ./.travis.yml.bak;
55-
5652
# Update the images.txt file
5753
cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt;
5854
sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt;

ga/24.0.0.4/images.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

ga/24.0.0.4/full/Dockerfile.ubi.ibmjava8 renamed to ga/24.0.0.5/full/Dockerfile.ubi.ibmjava8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.4-kernel-java8-ibmjava-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java8-ibmjava-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.4-kernel-java8-ibmjava-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java8-ibmjava-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/24.0.0.4/full/Dockerfile.ubi.openjdk11 renamed to ga/24.0.0.5/full/Dockerfile.ubi.openjdk11

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.4-kernel-java11-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java11-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.4-kernel-java11-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java11-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/24.0.0.4/full/Dockerfile.ubi.openjdk17 renamed to ga/24.0.0.5/full/Dockerfile.ubi.openjdk17

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.4-kernel-java17-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java17-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.4-kernel-java17-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java17-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/24.0.0.4/full/Dockerfile.ubi.openjdk21 renamed to ga/24.0.0.5/full/Dockerfile.ubi.openjdk21

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.4-kernel-java21-openj9-ubi9-minimal
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java21-openj9-ubi9-minimal
1616
FROM $PARENT_IMAGE AS installBundle
1717

1818
ARG VERBOSE=false
@@ -36,7 +36,7 @@ RUN set -eux; \
3636
rm -rf /output/workarea /output/logs; \
3737
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
3838

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.4-kernel-java21-openj9-ubi9-minimal
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java21-openj9-ubi9-minimal
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

0 commit comments

Comments
 (0)