Skip to content

Commit

Permalink
Shellcheck cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Hiltgen committed Aug 2, 2018
1 parent 5e07249 commit a986e3f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.e2e
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions scripts/test/engine/run
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a986e3f

Please sign in to comment.