Merge pull request #24834 from geoand/#24820

Make sure container image labels configuration are considered by Jib
quarkusio · Apr 8, 2022 · a609559 · a609559
2 parents b2700d0 + b3de83e
commit a609559
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java b/...-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/JibProcessor.java
@@ -705,7 +705,7 @@ private void handleExtraFiles(OutputTargetBuildItem outputTarget, JibContainerBu
 
     private Map<String, String> allLabels(JibConfig jibConfig, ContainerImageConfig containerImageConfig,
             List<ContainerImageLabelBuildItem> containerImageLabels) {
-        if (jibConfig.labels.isEmpty() && containerImageLabels.isEmpty()) {
+        if (jibConfig.labels.isEmpty() && containerImageLabels.isEmpty() && containerImageConfig.labels.isEmpty()) {
             return Collections.emptyMap();
         }