Skip to content

Commit 2ea103e

Browse files
gkwan-ibmgkwan-ibm
authored
Merge pull request #77 from OpenLiberty/staging
Merge staging to prod - Version update (#76)
2 parents e6ed4d5 + 697952d commit 2ea103e

File tree

7 files changed

+39
-12
lines changed

7 files changed

+39
-12
lines changed

Diff for: ‎README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ For more information about the `springBootUtility` command, see the https://www.
112112

113113
The second stage begins with the [hotspot=OLimage2 file=0]`Open Liberty Docker image`. The Dockerfile copies the [hotspot=serverXml file=0]`server.xml` file from the `/opt/ol/wlp/templates` directory, which enables Spring Boot and TLS support. Then, the Dockerfile copies the Spring Boot dependent library JAR files that are at the [hotspot=libcache file=0]`lib.index.cache` directory and the [hotspot=thinjar file=0]`thin-guide-spring-boot-0.1.0.jar` file. The `lib.index.cache` directory and the `thin-guide-spring-boot-0.1.0.jar` file were both generated in the first stage.
114114

115-
include::{common-includes}/ol-kernel-docker-pull.adoc[]
115+
include::{common-includes}/ol-full-docker-pull.adoc[]
116116

117117
Use the following command to build the Docker image:
118118
[role='command']

Diff for: ‎finish/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Stage and thin the application
22
# tag::OLimage1[]
3-
FROM openliberty/open-liberty:kernel-java8-openj9-ubi as staging
3+
FROM openliberty/open-liberty:full-java11-openj9-ubi as staging
44
# end::OLimage1[]
55

66
# tag::copyJar[]
@@ -17,7 +17,7 @@ RUN springBootUtility thin \
1717

1818
# Build the image
1919
# tag::OLimage2[]
20-
FROM openliberty/open-liberty:kernel-java8-openj9-ubi
20+
FROM openliberty/open-liberty:full-java11-openj9-ubi
2121
# end::OLimage2[]
2222

2323
ARG VERSION=1.0

Diff for: ‎finish/pom.xml

+13-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.springframework.boot</groupId>
1111
<artifactId>spring-boot-starter-parent</artifactId>
12-
<version>2.2.7.RELEASE</version>
12+
<version>2.4.5</version>
1313
</parent>
1414

1515
<dependencies>
@@ -29,6 +29,17 @@
2929
<artifactId>spring-boot-starter-test</artifactId>
3030
<scope>test</scope>
3131
</dependency>
32+
<dependency>
33+
<groupId>org.junit.vintage</groupId>
34+
<artifactId>junit-vintage-engine</artifactId>
35+
<scope>test</scope>
36+
<exclusions>
37+
<exclusion>
38+
<groupId>org.hamcrest</groupId>
39+
<artifactId>hamcrest-core</artifactId>
40+
</exclusion>
41+
</exclusions>
42+
</dependency>
3243
<!-- end::tests[] -->
3344
</dependencies>
3445

@@ -60,7 +71,7 @@
6071
<plugin>
6172
<groupId>io.openliberty.tools</groupId>
6273
<artifactId>liberty-maven-plugin</artifactId>
63-
<version>3.2.3</version>
74+
<version>3.3.4</version>
6475
<configuration>
6576
<!-- tag::appsDirectory[] -->
6677
<appsDirectory>apps</appsDirectory>

Diff for: ‎scripts/dailyBuild.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ while getopts t:d:b:u: flag; do
55
d) DRIVER="${OPTARG}" ;;
66
b) BUILD="${OPTARG}" ;;
77
u) DOCKER_USERNAME="${OPTARG}" ;;
8+
*) echo "Invalid option";;
89
esac
910
done
1011

1112
echo "Testing daily build image"
1213

13-
sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#,\#<configuration>#c<artifactId>liberty-maven-plugin</artifactId><version>3.2.3</version><configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/"$DATE"/"$DRIVER"</runtimeUrl></install>" pom.xml
14+
sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#,\#<configuration>#c<artifactId>liberty-maven-plugin</artifactId><version>3.3.4</version><configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER</runtimeUrl></install>" pom.xml
1415
cat pom.xml
1516

16-
sed -i "s;FROM openliberty/open-liberty:kernel-java8-openj9-ubi;FROM "$DOCKER_USERNAME"/olguides:"$BUILD";g" Dockerfile
17+
sed -i "s;FROM openliberty/open-liberty:full-java8-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
1718
cat Dockerfile
1819

1920
sudo ../scripts/testApp.sh

Diff for: ‎scripts/dockerImageTest.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ while getopts t:d: flag; do
33
case "${flag}" in
44
t) DATE="${OPTARG}" ;;
55
d) DRIVER="${OPTARG}" ;;
6+
*) echo "Invalid option";;
67
esac
78
done
89

910
echo "Testing latest OpenLiberty Docker image"
1011

11-
sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#,\#<configuration>#c<artifactId>liberty-maven-plugin</artifactId><version>3.2.3</version><configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/"$DATE"/"$DRIVER"</runtimeUrl></install>" pom.xml
12+
sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#,\#<configuration>#c<artifactId>liberty-maven-plugin</artifactId><version>3.2.3</version><configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/""$DATE""/""$DRIVER""</runtimeUrl></install>" pom.xml
1213
cat pom.xml
1314

14-
sed -i "s;FROM openliberty/open-liberty:kernel-java8-openj9-ubi;FROM openliberty/daily:latest;g" Dockerfile
15+
sed -i "s;FROM openliberty/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" Dockerfile
1516
cat Dockerfile
1617

1718
docker pull "openliberty/daily:latest"

Diff for: ‎scripts/testApp.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ set -euxo pipefail
77
##
88
##############################################################################
99

10-
./mvnw -q clean package
10+
./mvnw -Dhttp.keepAlive=false \
11+
-Dmaven.wagon.http.pool=false \
12+
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
13+
-q clean package
1114

12-
docker pull openliberty/open-liberty:kernel-java8-openj9-ubi
15+
docker pull openliberty/open-liberty:full-java11-openj9-ubi
1316

1417
docker build -t springboot .
1518
docker run -d --name springBootContainer -p 9080:9080 -p 9443:9443 springboot

Diff for: ‎start/pom.xml

+12-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.boot</groupId>
1212
<artifactId>spring-boot-starter-parent</artifactId>
13-
<version>2.2.7.RELEASE</version>
13+
<version>2.4.5</version>
1414
</parent>
1515

1616
<dependencies>
@@ -30,6 +30,17 @@
3030
<artifactId>spring-boot-starter-test</artifactId>
3131
<scope>test</scope>
3232
</dependency>
33+
<dependency>
34+
<groupId>org.junit.vintage</groupId>
35+
<artifactId>junit-vintage-engine</artifactId>
36+
<scope>test</scope>
37+
<exclusions>
38+
<exclusion>
39+
<groupId>org.hamcrest</groupId>
40+
<artifactId>hamcrest-core</artifactId>
41+
</exclusion>
42+
</exclusions>
43+
</dependency>
3344
<!-- end::tests[] -->
3445
</dependencies>
3546

0 commit comments

Comments
 (0)