Merge pull request openshift#222 from nalind/workdir-test

conformance: test non-root USER before WORKDIR

Author: openshift-merge-robot

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 
 go:
-  - "1.16"
   - "1.17"
+  - "1.18"
 
 install:
 

dockerclient/conformance_test.go

@@ -458,6 +458,16 @@ func TestConformanceInternal(t *testing.T) {
 			ContextDir: "testdata/multistage",
 			Dockerfile: "Dockerfile.env",
 		},
+		{
+			Name:       "nonroot-USER-before-WORKDIR-used",
+			ContextDir: "testdata/user-workdir",
+			Dockerfile: "Dockerfile.used",
+		},
+		{
+			Name:       "nonroot-USER-before-WORKDIR-notused",
+			ContextDir: "testdata/user-workdir",
+			Dockerfile: "Dockerfile.notused",
+		},
 	}
 
 	for i, test := range testCases {

dockerclient/testdata/user-workdir/Dockerfile.notused

@@ -0,0 +1,4 @@
+FROM alpine
+RUN adduser -D buildtest
+USER buildtest
+WORKDIR /workdir/created/deep/below

dockerclient/testdata/user-workdir/Dockerfile.used

@@ -0,0 +1,5 @@
+FROM alpine
+RUN adduser -D buildtest
+USER buildtest
+WORKDIR /workdir/created/deep/below
+RUN ls -l /workdir