Merge pull request #1177 from bmuschko/bm/base-image-upgrade

Upgrade base image to latest patch version
bmuschko · Apr 18, 2023 · e3bceb5 · e3bceb5
2 parents 50dd258 + 18cd785
commit e3bceb5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/docs/asciidoc/user-guide/22-extension.adoc b/src/docs/asciidoc/user-guide/22-extension.adoc
@@ -7,7 +7,7 @@ The following properties can be configured:
 [options="header"]
 |=======
 |Property name   |Type                               |Default value                                                 |Description
-|`baseImage`     |`Property<String>`                 |`openjdk:11.0.15-jre-slim`                                    |The Docker base image used for Java application.
+|`baseImage`     |`Property<String>`                 |`openjdk:11.0.16-jre-slim`                                    |The Docker base image used for Java application.
 |`maintainer`    |`Property<String>`                 |Value of system property `user.name`                          |The maintainer of the image.
 |`user`          |`Property<String>`                 |None                                                          |The user name (or UID) and optionally the user group (or GID) to use as the default user and group to run the container.
 |`ports`         |`ListProperty<Integer>`            |`[8080]`                                                      |The Docker image exposed ports.

diff --git a/src/docs/asciidoc/user-guide/32-extension.adoc b/src/docs/asciidoc/user-guide/32-extension.adoc
@@ -8,7 +8,7 @@ The following properties can be configured:
 [options="header"]
 |=======
 |Property name   |Type                    |Default value                                                 |Description
-|`baseImage`     |`Property<String>`      |`openjdk:11.0.15-jre-slim`                                    |The Docker base image used for the Spring Boot application.
+|`baseImage`     |`Property<String>`      |`openjdk:11.0.16-jre-slim`                                    |The Docker base image used for the Spring Boot application.
 |`maintainer`    |`Property<String>`      |Value of system property `user.name`                          |The maintainer of the image.
 |`user`          |`Property<String>`      |None                                                          |The user name (or UID) and optionally the user group (or GID) to use as the default user and group to run the container.
 |`ports`         |`ListProperty<Integer>` |`[8080]`                                                      |The Docker image exposed ports.

diff --git a/...functTest/groovy/com/bmuschko/gradle/docker/fixtures/DockerConventionPluginFixture.groovy b/...functTest/groovy/com/bmuschko/gradle/docker/fixtures/DockerConventionPluginFixture.groovy
@@ -3,7 +3,7 @@ package com.bmuschko.gradle.docker.fixtures
 final class DockerConventionPluginFixture {
 
     public static final String PROJECT_NAME = 'powered-by-docker'
-    public static final String DEFAULT_BASE_IMAGE = 'openjdk:11.0.15-jre-slim'
+    public static final String DEFAULT_BASE_IMAGE = 'openjdk:11.0.16-jre-slim'
     public static final String CUSTOM_BASE_IMAGE = 'openjdk:8u171-jre-alpine'
 
     private DockerConventionPluginFixture() {}

diff --git a/src/main/java/com/bmuschko/gradle/docker/DockerConventionJvmApplicationExtension.java b/src/main/java/com/bmuschko/gradle/docker/DockerConventionJvmApplicationExtension.java
@@ -17,7 +17,7 @@ public class DockerConventionJvmApplicationExtension {
     /**
      * The Docker base image used for Java application.
      * <p>
-     * Defaults to {@code openjdk:11.0.15-jre-slim}.
+     * Defaults to {@code openjdk:11.0.16-jre-slim}.
      */
     public final Property<String> getBaseImage() {
         return baseImage;
@@ -115,7 +115,7 @@ public final ListProperty<String> getArgs() {
 
     public DockerConventionJvmApplicationExtension(ObjectFactory objectFactory) {
         baseImage = objectFactory.property(String.class);
-        baseImage.convention("openjdk:11.0.15-jre-slim");
+        baseImage.convention("openjdk:11.0.16-jre-slim");
         maintainer = objectFactory.property(String.class);
         maintainer.convention(System.getProperty("user.name"));
         user = objectFactory.property(String.class);