Merge branch 'master' into master

fabric8io · Nov 5, 2021 · c82f5c7 · c82f5c7
2 parents 83bf2d3 + d3d3618
commit c82f5c7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -4,6 +4,9 @@
   - Allow replacement in tags. Added a new replacement `%T` which always adds a timestamp. ([#1491](https://github.com/fabric8io/docker-maven-plugin/pull/1491))
   - Only push the `latest` tag if no other tags where specified in docker mode. This can break your build, if you rely on the automatic `latest` tag. ([#1496](https://github.com/fabric8io/docker-maven-plugin/pull/1496))
   - Only push the `latest` tag if no other tags where specified in jib mode. This can break your build, if you rely on the automatic `latest` tag. ([#1498](https://github.com/fabric8io/docker-maven-plugin/pull/1498))
+  - Deprecate `entrypoint` parameter in `<run>` configuration ([1488](https://github.com/fabric8io/docker-maven-plugin/pull/1488))
+
+**Note:** `entrypoint` parameter in `<run>` configuration is marked as deprecated. Users are advised to use `entryPoint` parameter instead.
 
 * **0.37.0** (2021-08-15)
   - Fix stop mojo by taking container name pattern into account (#1168)

diff --git a/src/main/java/io/fabric8/maven/docker/config/BuildImageConfiguration.java b/src/main/java/io/fabric8/maven/docker/config/BuildImageConfiguration.java
@@ -721,9 +721,10 @@ private void ensureUniqueAssemblyNames(Logger log) {
         List<AssemblyConfiguration> assemblyConfigurations = getAssemblyConfigurations();
         Set<String> assemblyNames = new HashSet<>();
         for (AssemblyConfiguration config : assemblyConfigurations) {
-            boolean wasElementAbsent = assemblyNames.add(config.getName());
+            String assemblyName = config.getName();
+            boolean wasElementAbsent = assemblyNames.add(assemblyName);
             if (!wasElementAbsent) {
-                log.error("Multiple assemblies use the name %s. Please assign each assembly a unique name.");
+                log.error("Multiple assemblies use the name \"%s\". Please assign each assembly a unique name.", assemblyName);
                 throw new IllegalArgumentException("Assembly names must be unique");
             }
         }

diff --git a/src/main/java/io/fabric8/maven/docker/config/RunImageConfiguration.java b/src/main/java/io/fabric8/maven/docker/config/RunImageConfiguration.java
@@ -47,10 +47,17 @@ public boolean isDefault() {
     @Parameter
     private List<String> dependsOn;
 
-    // container entry point
+    /**
+     * container entry point
+     * @deprecated This field would be removed in upcoming releases. Use <code>entryPoint</code> instead.
+     */
     @Parameter
+    @Deprecated
     private Arguments entrypoint;
 
+    @Parameter
+    private Arguments entryPoint;
+
     // container hostname
     @Parameter
     private String hostname;
@@ -201,6 +208,9 @@ public String initAndValidate() {
         if (entrypoint != null) {
             entrypoint.validate();
         }
+        if (entryPoint != null) {
+            entryPoint.validate();
+        }
         if (cmd != null) {
             cmd.validate();
         }
@@ -227,7 +237,10 @@ public String getEnvPropertyFile() {
     }
 
     public Arguments getEntrypoint() {
-        return entrypoint;
+        if (entrypoint != null) {
+            return entrypoint;
+        }
+        return entryPoint;
     }
 
     public String getHostname() {
@@ -478,6 +491,7 @@ public Builder domainname(String domainname) {
 
         public Builder entrypoint(Arguments args) {
             config.entrypoint = args;
+            config.entryPoint = args;
             return this;
         }