diff --git a/dockerfiles/Dockerfile.e2e b/dockerfiles/Dockerfile.e2e index f1587b8a29e5..7d401bd15130 100644 --- a/dockerfiles/Dockerfile.e2e +++ b/dockerfiles/Dockerfile.e2e @@ -19,7 +19,7 @@ RUN git clone https://github.com/containerd/containerd.git /go/src/github.com/co git checkout ${CONTAINERD_VERSION} && \ make && \ make install -COPY scripts/test/engine/config.toml /etc/containerd/config.toml +COPY e2eengine/config.toml /etc/containerd/config.toml # TODO - consider replacing with an official image and a multi-stage build to pluck the binaries out ARG RUNC_VERSION=v1.0.0-rc5 diff --git a/scripts/test/engine/config.toml b/e2eengine/config.toml similarity index 100% rename from scripts/test/engine/config.toml rename to e2eengine/config.toml diff --git a/scripts/test/engine/run b/scripts/test/engine/run index f26e5152d6ac..e19d1645594e 100755 --- a/scripts/test/engine/run +++ b/scripts/test/engine/run @@ -19,6 +19,7 @@ function setup { echo "Starting containerd in the background" containerd 2&> /tmp/containerd.err & echo "Waiting for containerd to be responsive" + # shellcheck disable=SC2034 for i in $(seq 1 60); do if ctr namespace ls > /dev/null; then break