Skip to content

Commit 06062b1

Browse files
committed
test images: ARG instructions should be first
A few other Dockerfiles had the ARG duplicated as well.
1 parent 0669581 commit 06062b1

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

test/images/node-perf/npb-ep/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ RUN make EP CLASS=D
3434
# main container in the second build stage.
3535
RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \;
3636

37-
ARG BASEIMAGE
3837
FROM $BASEIMAGE
3938

4039
COPY --from=build_node_perf_npb_ep /NPB3.3.1/NPB3.3-OMP/bin/ep.D.x /

test/images/node-perf/npb-is/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ RUN make IS CLASS=D
3636
# main container in the second build stage.
3737
RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \;
3838

39-
ARG BASEIMAGE
4039
FROM $BASEIMAGE
4140

4241
COPY --from=build_node_perf_npb_is /NPB3.3.1/NPB3.3-OMP/bin/is.D.x /

test/images/sample-apiserver/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
ARG BASEIMAGE
1516
FROM us.gcr.io/k8s-artifacts-prod/build-image/kube-cross:v1.13.8-1 as build_k8s_1_17_sample_apiserver
1617

1718
ENV GOPATH /go
@@ -32,7 +33,6 @@ RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=BASEARCH go get k8s.io/sample
3233
# we can copy it out from this throw away container image from a standard location
3334
RUN find /go/bin -name sample-apiserver -exec cp {} / \;
3435

35-
ARG BASEIMAGE
3636
FROM $BASEIMAGE
3737
COPY --from=build_k8s_1_17_sample_apiserver /sample-apiserver /sample-apiserver
3838

0 commit comments

Comments
 (0)