From 06062b15e96fd867a0de08470be1a19ce16e2b91 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Fri, 28 Feb 2020 00:00:38 -0800 Subject: [PATCH] test images: ARG instructions should be first A few other Dockerfiles had the ARG duplicated as well. --- test/images/node-perf/npb-ep/Dockerfile | 1 - test/images/node-perf/npb-is/Dockerfile | 1 - test/images/sample-apiserver/Dockerfile | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test/images/node-perf/npb-ep/Dockerfile b/test/images/node-perf/npb-ep/Dockerfile index a87ad660845..1988a5d4f9c 100644 --- a/test/images/node-perf/npb-ep/Dockerfile +++ b/test/images/node-perf/npb-ep/Dockerfile @@ -34,7 +34,6 @@ RUN make EP CLASS=D # main container in the second build stage. RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \; -ARG BASEIMAGE FROM $BASEIMAGE COPY --from=build_node_perf_npb_ep /NPB3.3.1/NPB3.3-OMP/bin/ep.D.x / diff --git a/test/images/node-perf/npb-is/Dockerfile b/test/images/node-perf/npb-is/Dockerfile index cc43af6f797..fab764b3252 100644 --- a/test/images/node-perf/npb-is/Dockerfile +++ b/test/images/node-perf/npb-is/Dockerfile @@ -36,7 +36,6 @@ RUN make IS CLASS=D # main container in the second build stage. RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \; -ARG BASEIMAGE FROM $BASEIMAGE COPY --from=build_node_perf_npb_is /NPB3.3.1/NPB3.3-OMP/bin/is.D.x / diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile index b5a2a7e265b..1d8e8205ddc 100644 --- a/test/images/sample-apiserver/Dockerfile +++ b/test/images/sample-apiserver/Dockerfile @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +ARG BASEIMAGE FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.8-1 as build_k8s_1_17_sample_apiserver ENV GOPATH /go @@ -32,7 +33,6 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=BASEARCH go get k8s.io/sample # we can copy it out from this throw away container image from a standard location RUN find /go/bin -name sample-apiserver -exec cp {} / \; -ARG BASEIMAGE FROM $BASEIMAGE COPY --from=build_k8s_1_17_sample_apiserver /sample-apiserver /sample-apiserver