github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97982 from hasheddan/conformance-platforms

Browse Source 
Fix non-amd64 conformance image builds
This commit is contained in:
Kubernetes Prow Robot 2021-01-13 10:19:01 -08:00 committed by GitHub
commit 9ca86c2404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/conformance/Dockerfile
View File

@ -12,7 +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.
FROM BASEIMAGE FROM --platform=linux/ARCH BASEIMAGE
COPY ginkgo /usr/local/bin/ COPY ginkgo /usr/local/bin/
COPY e2e.test /usr/local/bin/ COPY e2e.test /usr/local/bin/

4
cluster/images/conformance/Makefile
View File

@ -31,7 +31,7 @@ E2E_GO_RUNNER_BIN?=$(shell test -f $(LOCAL_OUTPUT_PATH)/go-runner && echo $(LOCA
CLUSTER_DIR?=$(shell pwd)/../../../cluster/ CLUSTER_DIR?=$(shell pwd)/../../../cluster/
BASEIMAGE=debian:stretch-slim BASEIMAGE=debian:stable-slim
TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX) TEMP_DIR:=$(shell mktemp -d -t conformanceXXXXXX)
all: build all: build
@ -54,7 +54,7 @@ endif
chmod a+rx ${TEMP_DIR}/e2e.test chmod a+rx ${TEMP_DIR}/e2e.test
chmod a+rx ${TEMP_DIR}/gorunner chmod a+rx ${TEMP_DIR}/gorunner
cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile cd ${TEMP_DIR} && sed -i.back "s|ARCH|${ARCH}|g; s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
docker build --pull -t ${REGISTRY}/conformance-${ARCH}:${VERSION} ${TEMP_DIR} docker build --pull -t ${REGISTRY}/conformance-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"