Skip to content

Commit eb1a0b6

Browse files
authored
Merge pull request #698 from wraschke/25006-vNext-mergeConflict-fix
Merge conflict fixes from command line for 25.0.0.6 cycle
2 parents 0bbeb6e + 880469a commit eb1a0b6

5 files changed

Lines changed: 115 additions & 9 deletions

File tree

CONTRIBUTING.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Contributing to WebSphere Liberty Container Images
2+
3+
There are multiple ways to contribute: report bugs, request features, fix bugs, contribute code, improve documentation, etc. You must follow the established process and guidelines. We welcome your contributions!
4+
5+
- [Raising issues](#Raising-Issues)
6+
- [Legal](#Legal)
7+
- [Coding Standards](#Coding-Standards)
8+
9+
## Raising Issues
10+
11+
Please raise any bug reports or feature requests on the [WebSphere Liberty Container Images project repository's GitHub issue tracker](https://github.com/WASdev/ci.docker/issues). Search the list to see if your issue has already been raised.
12+
13+
A good bug report is one that makes it easy for everyone to understand what you were trying to do and what went wrong. Please provide as much context as possible so we can try to recreate the issue.
14+
15+
## Legal
16+
17+
We use the same approach - the Developer's Certificate of Origin 1.1 (DCO) - that the Linux® Kernel community uses to manage code contributions.
18+
19+
For us to accept pull requests, you must declare that you wrote the code or, at least, have the right to contribute it to the repo under the open source license of the project in the repo. It's that easy.
20+
21+
1. Read the following terms from [DCO](https://elinux.org/Developer_Certificate_Of_Origin) :
22+
23+
```
24+
Developer's Certificate of Origin 1.1
25+
26+
By making a contribution to this project, I certify that:
27+
28+
(a) The contribution was created in whole or in part by me and I
29+
have the right to submit it under the open source license
30+
indicated in the file; or
31+
32+
(b) The contribution is based upon previous work that, to the best
33+
of my knowledge, is covered under an appropriate open source
34+
license and I have the right under that license to submit that
35+
work with modifications, whether created in whole or in part
36+
by me, under the same open source license (unless I am
37+
permitted to submit under a different license), as indicated
38+
in the file; or
39+
40+
(c) The contribution was provided directly to me by some other
41+
person who certified (a), (b) or (c) and I have not modified
42+
it.
43+
44+
(d) I understand and agree that this project and the contribution
45+
are public and that a record of the contribution (including all
46+
personal information I submit with it, including my sign-off) is
47+
maintained indefinitely and may be redistributed consistent with
48+
this project or the open source license(s) involved.
49+
```
50+
51+
2. If you can certify that it is true, sign off your `git commit` with a message like this:
52+
```
53+
Signed-off-by: John Doe <john.doe@example.com>
54+
```
55+
You must use your real name (no pseudonyms or anonymous contributions, sorry).
56+
57+
Instead of typing that in every git commit message, your Git tools might let you automatically add the details for you. If you configure them to do that, when you issue the `git commit` command, just add the `-s` option.
58+
59+
If you are an IBMer, please contact us directly, as the contribution process is slightly different.
60+
61+
## Coding Standards
62+
63+
Please ensure you follow the coding standards used throughout the existing code base.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ For the list of known issues related to images, see the [Known Issues](https://g
328328

329329
# Issues and Contributions
330330

331-
For issues relating specifically to the Dockerfiles and scripts, please use the [GitHub issue tracker](https://github.com/WASdev/ci.docker/issues). For more general issue relating to IBM WebSphere Application Server Liberty you can [get help](https://developer.ibm.com/wasdev/help/) through the WASdev community or, if you have production licenses for WebSphere Application Server, via the usual support channels. We welcome contributions following [our guidelines](https://github.com/WASdev/wasdev.github.io/blob/master/CONTRIBUTING.md).
331+
For issues relating specifically to the Dockerfiles and scripts, please use the [GitHub issue tracker](https://github.com/WASdev/ci.docker/issues). For more general issue relating to IBM WebSphere Application Server Liberty you can [get help](https://developer.ibm.com/wasdev/help/) through the WASdev community or, if you have production licenses for WebSphere Application Server, via the usual support channels. We welcome contributions following [our guidelines](https://github.com/WASdev/ci.docker/blob/main/CONTRIBUTING.md).
332332

333333
# License
334334

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ If set to true, then the default certificates from the JVM are used in addition
99

1010
### Providing custom certificates (`20.0.0.3+`)
1111

12-
It is possible to provide custom PEM certifacates by mounting the files into the container. Files that will be imported are `tls.key`, `tls.crt` and `ca.crt`.
12+
It is possible to provide custom PEM certificates by mounting the files into the container. Files that will be imported are `tls.key`, `tls.crt` and `ca.crt`.
1313

1414
The location can be specified by `TLS_DIR` environment variable. Default location
1515
for certificates is `/etc/x509/certs/`.

docs/icr-images.md

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Available image tags are listed below. The tags use the following naming convent
1010
<optional fix pack version-><liberty image type>-<java version>-<java type>-<base image type>
1111
```
1212

13-
Liberty images with Java 21 are based on UBI 9 minimal and include IBM Semeru Runtimes for Java 21 JRE. This combination offers a compact and effective Java runtime that is suited for applications that need Java 21.
13+
Liberty images based on Universal Base Image (UBI) 9 minimal include the JRE of IBM Semeru Runtime 21, 17, 11 or 8 or IBM Java 8. This combination offers a compact and effective Java runtime.
1414

15-
Liberty images with Java 8, 11 and 17 and with the `openj9` type are based on UBI 8 standard and include IBM Semeru Runtime for the respective Java version with the JDK. Images with the `ibmjava` type are based on UBI 8 standard and include IBM Java 8 JRE.
15+
Liberty images with Java 17, 11 and 8, the `openj9` type and based on UBI 8 standard include IBM Semeru Runtime for the respective Java version with the JDK. Java 8 images with the `ibmjava` type and based on UBI 8 standard include IBM Java 8 JRE.
1616

1717
The `latest` tag simplifies pulling the full latest Open Liberty release with the latest Java JRE. It is an alias for the full-java21-openj9-ubi-minimal tag. If you do not specify a tag value, `latest` is used by default.
1818

@@ -30,16 +30,26 @@ ibmcloud cr images --restrict appcafe/websphere-liberty
3030

3131
## Latest version
3232

33-
The following tags include the most recent WebSphere Liberty version: `25.0.0.3`
33+
The following tags include the most recent WebSphere Liberty version: `25.0.0.5`
3434

3535
```
3636
kernel-java21-openj9-ubi-minimal
37+
kernel-java17-openj9-ubi-minimal
38+
kernel-java11-openj9-ubi-minimal
39+
kernel-java8-openj9-ubi-minimal
40+
kernel-java8-ibmjava-ubi-minimal
41+
3742
kernel-java17-openj9-ubi
3843
kernel-java11-openj9-ubi
39-
kernel-java8-ibmjava-ubi
4044
kernel-java8-openj9-ubi
45+
kernel-java8-ibmjava-ubi
4146
4247
full-java21-openj9-ubi-minimal
48+
full-java17-openj9-ubi-minimal
49+
full-java11-openj9-ubi-minimal
50+
full-java8-openj9-ubi-minimal
51+
full-java8-ibmjava-ubi-minimal
52+
4353
full-java17-openj9-ubi
4454
full-java11-openj9-ubi
4555
full-java8-openj9-ubi
@@ -48,6 +58,32 @@ full-java8-ibmjava-ubi
4858
latest
4959
```
5060

61+
## 25.0.0.5
62+
63+
```
64+
25.0.0.5-kernel-java21-openj9-ubi-minimal
65+
25.0.0.5-kernel-java17-openj9-ubi-minimal
66+
25.0.0.5-kernel-java11-openj9-ubi-minimal
67+
25.0.0.5-kernel-java8-openj9-ubi-minimal
68+
25.0.0.5-kernel-java8-ibmjava-ubi-minimal
69+
70+
25.0.0.5-kernel-java17-openj9-ubi
71+
25.0.0.5-kernel-java11-openj9-ubi
72+
25.0.0.5-kernel-java8-openj9-ubi
73+
25.0.0.5-kernel-java8-ibmjava-ubi
74+
75+
25.0.0.5-full-java21-openj9-ubi-minimal
76+
25.0.0.5-full-java17-openj9-ubi-minimal
77+
25.0.0.5-full-java11-openj9-ubi-minimal
78+
25.0.0.5-full-java8-openj9-ubi-minimal
79+
25.0.0.5-full-java8-ibmjava-ubi-minimal
80+
81+
25.0.0.5-full-java17-openj9-ubi
82+
25.0.0.5-full-java11-openj9-ubi
83+
25.0.0.5-full-java8-openj9-ubi
84+
25.0.0.5-full-java8-ibmjava-ubi
85+
```
86+
5187
## 25.0.0.3
5288

5389
```

ga/25.0.0.3/kernel/helpers/build/infinispan-client-setup.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@
1616

1717
set -Eeox pipefail
1818

19-
yum update -y
20-
yum install -y maven
19+
pkgcmd=yum
20+
if ! command $pkgcmd
21+
then
22+
pkgcmd=microdnf
23+
fi
24+
25+
$pkgcmd update -y
26+
$pkgcmd install -y maven
2127
mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan
2228
echo '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>io.openliberty</groupId> <artifactId>openliberty-infinispan-client</artifactId> <version>1.0</version> <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote --> <dependencies> <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-jcache-remote</artifactId> <version>10.1.3.Final</version> </dependency> </dependencies></project>' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
2329
mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false
2430
mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan
25-
yum remove -y maven
31+
# This fails with dependency errors using microdnf on ubi-minimal, but it is okay to let it fail
32+
yum remove -y maven || true
2633
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
2734
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/jboss-transaction-api*.jar
2835
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/reactive-streams-*.jar

0 commit comments

Comments
 (0)