diff --git a/Dockerfile b/Dockerfile index 15f518ad..a097a2db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ RUN curl -o /usr/local/bin/umoci -fsSL https://github.com/opencontainers/umoci/r && chmod +x /usr/local/bin/umoci # install debug tools -RUN go get github.com/go-delve/delve/cmd/dlv@v1.7.3 \ +RUN RUN go get github.com/go-delve/delve/cmd/dlv@v1.7.3\ && apt-get update \ && apt-get install -y --no-install-recommends \ psmisc @@ -71,7 +71,7 @@ COPY tests/integration/multi-arch.bash tests/integration/ ENV ROOTFS /busybox RUN mkdir -p "${ROOTFS}" RUN . tests/integration/multi-arch.bash \ - && curl -fsSL https://github.com/openstack/kuryr/raw/master/contrib/busybox/busybox.tar.xz | tar Jxf - -C "${ROOTFS}" + && curl -fsSL `get_busybox` | tar xfJC - "${ROOTFS}" ENV DEBIAN_ROOTFS /debian RUN mkdir -p "${DEBIAN_ROOTFS}" diff --git a/tests/integration/multi-arch.bash b/tests/integration/multi-arch.bash index 83bf875d..1dd751bb 100644 --- a/tests/integration/multi-arch.bash +++ b/tests/integration/multi-arch.bash @@ -2,7 +2,7 @@ get_busybox() { case $(go env GOARCH) in arm64) - echo 'https://github.com/openstack/kuryr/raw/master/contrib/busybox/busybox.tar.xz' + echo 'https://github.com/docker-library/busybox/raw/dist-arm64v8/stable/glibc/busybox.tar.xz' ;; *) echo 'https://github.com/docker-library/busybox/raw/dist-amd64/stable/glibc/busybox.tar.xz'