Skip to content

Commit 358a7bb

Browse files
authored
Use java 8 (#132)
* Update README.adoc use java 8 * Update Dockerfile use java8 * Update testApp.sh use java8 * Update dockerImageTest.sh use java8 * Update dailyBuild.sh use java8 * Update dailyBuild.sh full image does not support features.sh * Update dockerImageTest.sh full image does not support features.sh
1 parent c82ec18 commit 358a7bb

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

Diff for: README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Your `springboot` image appears in the list of Docker images:
149149
[role='no_copy']
150150
```
151151
REPOSITORY TAG IMAGE ID CREATED SIZE
152-
springboot latest d3ffdaa81854 27 seconds ago 486MB
152+
springboot latest d3ffdaa81854 27 seconds ago 596MB
153153
```
154154

155155
Now, you can run the Spring Boot application in a Docker container:

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 icr.io/appcafe/open-liberty:full-java11-openj9-ubi as staging
3+
FROM icr.io/appcafe/open-liberty:full-java8-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 icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
20+
FROM icr.io/appcafe/open-liberty:kernel-slim-java8-openj9-ubi
2121
# end::OLimage2[]
2222

2323
ARG VERSION=1.0

Diff for: scripts/dailyBuild.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ echo "Testing daily build image"
1414
sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#,\#<configuration>#c<artifactId>liberty-maven-plugin</artifactId><version>3.5.1</version><configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER</runtimeUrl></install>" pom.xml
1515
cat pom.xml
1616

17-
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
17+
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java8-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
18+
sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile
1819
cat Dockerfile
1920

2021
sudo ../scripts/testApp.sh

Diff for: scripts/dockerImageTest.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ echo "Testing latest OpenLiberty Docker image"
1212
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
1313
cat pom.xml
1414

15-
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM openliberty/daily:latest;g" Dockerfile
15+
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java8-openj9-ubi;FROM openliberty/daily:latest;g" Dockerfile
16+
sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile
1617
cat Dockerfile
1718

1819
docker pull -q "openliberty/daily:latest"

Diff for: scripts/testApp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set -euxo pipefail
1212
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
1313
-q clean package
1414

15-
docker pull -q icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
15+
docker pull -q icr.io/appcafe/open-liberty:kernel-slim-java8-openj9-ubi
1616

1717
docker build -t springboot .
1818
docker run -d --name springBootContainer -p 9080:9080 -p 9443:9443 springboot

0 commit comments

Comments
 (0)