Rebase over 1105

integration/dockerfiles/Dockerfile_test_user_without_grp

@@ -1,19 +0,0 @@
-# Copyright 2018 Google, Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM debian:9.11
-RUN groupadd testgroup && \
-    useradd --create-home --gid testgroup alice
-
-USER alice

pkg/commands/user.go

@@ -55,9 +55,8 @@ func (r *UserCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile.Bu
 		}
 		userStr = userStr + ":" + groupStr
 	}
-	
-	config.User = userStr
 
+	config.User = userStr
 	return nil
 }