github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88903 from claudiubelu/test-images/sample-apiserver-fix

Browse Source 
test images: ARG instructions should be first
This commit is contained in:
Kubernetes Prow Robot 2020-03-10 11:15:35 -07:00 committed by GitHub
commit c4a7d3cf16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/images/node-perf/npb-ep/Dockerfile
View File

@ -34,7 +34,6 @@ RUN make EP CLASS=D
# main container in the second build stage. # main container in the second build stage.
RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \; RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \;
ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
COPY --from=build_node_perf_npb_ep /NPB3.3.1/NPB3.3-OMP/bin/ep.D.x / COPY --from=build_node_perf_npb_ep /NPB3.3.1/NPB3.3-OMP/bin/ep.D.x /

1
test/images/node-perf/npb-is/Dockerfile
View File

@ -36,7 +36,6 @@ RUN make IS CLASS=D
# main container in the second build stage. # main container in the second build stage.
RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \; RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \;
ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
COPY --from=build_node_perf_npb_is /NPB3.3.1/NPB3.3-OMP/bin/is.D.x / COPY --from=build_node_perf_npb_is /NPB3.3.1/NPB3.3-OMP/bin/is.D.x /

2
test/images/sample-apiserver/Dockerfile
View File

@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 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 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 # we can copy it out from this throw away container image from a standard location
RUN find /go/bin -name sample-apiserver -exec cp {} / \; RUN find /go/bin -name sample-apiserver -exec cp {} / \;
ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
COPY --from=build_k8s_1_17_sample_apiserver /sample-apiserver /sample-apiserver COPY --from=build_k8s_1_17_sample_apiserver /sample-apiserver /sample-apiserver