Inherit USER from base image

jib-core/CHANGELOG.md

@@ -27,6 +27,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fixes the problem not inheriting `USER` container configuration from a base image. ([#2421](https://github.com/GoogleContainerTools/jib/pull/2421))
+
 ## 0.13.1
 
 ### Fixed

jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/BuildImageStep.java

@@ -83,6 +83,7 @@ public Image call() throws LayerPropertyNotFoundException {
           .setHealthCheck(baseImage.getHealthCheck())
           .addExposedPorts(baseImage.getExposedPorts())
           .addVolumes(baseImage.getVolumes())
+          .setUser(baseImage.getUser())
           .setWorkingDirectory(baseImage.getWorkingDirectory());
 
       // Add history elements for non-empty layers that don't have one yet
@@ -114,12 +115,14 @@ public Image call() throws LayerPropertyNotFoundException {
         imageBuilder
             .addEnvironment(containerConfiguration.getEnvironmentMap())
             .setCreated(containerConfiguration.getCreationTime())
-            .setUser(containerConfiguration.getUser())
             .setEntrypoint(computeEntrypoint(baseImage, containerConfiguration))
             .setProgramArguments(computeProgramArguments(baseImage, containerConfiguration))
             .addExposedPorts(containerConfiguration.getExposedPorts())
             .addVolumes(containerConfiguration.getVolumes())
             .addLabels(containerConfiguration.getLabels());
+        if (containerConfiguration.getUser() != null) {
+          imageBuilder.setUser(containerConfiguration.getUser());
+        }
         if (containerConfiguration.getWorkingDirectory() != null) {
           imageBuilder.setWorkingDirectory(containerConfiguration.getWorkingDirectory().toString());
         }

jib-core/src/test/java/com/google/cloud/tools/jib/builder/steps/BuildImageStepTest.java

@@ -102,6 +102,7 @@ public void setUp() throws DigestException {
             .addEnvironment(ImmutableMap.of("BASE_ENV", "BASE_ENV_VALUE", "BASE_ENV_2", "DEFAULT"))
             .addLabel("base.label", "base.label.value")
             .addLabel("base.label.2", "default")
+            .setUser("base:user")
             .setWorkingDirectory("/base/working/directory")
             .setEntrypoint(ImmutableList.of("baseImageEntrypoint"))
             .setProgramArguments(ImmutableList.of("catalina.sh", "run"))
@@ -143,6 +144,7 @@ public void test_basicCase() {
                 baseImageLayers,
                 applicationLayers)
             .call();
+    Assert.assertEquals("root", image.getUser());
     Assert.assertEquals(
         testDescriptorDigest, image.getLayers().asList().get(0).getBlobDescriptor().getDigest());
   }
@@ -230,6 +232,22 @@ public void testOverrideWorkingDirectory() {
     Assert.assertEquals("/my/directory", image.getWorkingDirectory());
   }
 
+  @Test
+  public void test_inheritedUser() {
+    Mockito.when(mockContainerConfiguration.getUser()).thenReturn(null);
+
+    Image image =
+        new BuildImageStep(
+                mockBuildContext,
+                mockProgressEventDispatcherFactory,
+                baseImage,
+                baseImageLayers,
+                applicationLayers)
+            .call();
+
+    Assert.assertEquals("base:user", image.getUser());
+  }
+
   @Test
   public void test_inheritedEntrypoint() {
     Mockito.when(mockContainerConfiguration.getEntrypoint()).thenReturn(null);

jib-gradle-plugin/CHANGELOG.md

@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fixes the problem not inheriting `USER` container configuration from a base image. ([#2421](https://github.com/GoogleContainerTools/jib/pull/2421))
+
 ## 2.2.0
 
 ### Added

jib-maven-plugin/CHANGELOG.md

@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fixes the problem not inheriting `USER` container configuration from a base image. ([#2421](https://github.com/GoogleContainerTools/jib/pull/2421))
+
 ## 2.2.0
 
 ### Added