Skip to content

Commit

Permalink
Use linux kind binary
Browse files Browse the repository at this point in the history
  • Loading branch information
tdmanv committed Aug 15, 2019
1 parent fe36193 commit 47958b4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: required

services:
- docker
- docker

# Selecting C as the language keeps the container to a minimum footprint. All
# go-specifc code is run in build container.
Expand All @@ -20,14 +20,14 @@ jobs:
include:
- stage: test
script:
- make docs
- make docs
- stage: test
before_script:
- make start-kind
before_script:
- make start-kind
script:
- make go-mod-download
- make build
- make test
after_script:
- make stop-kind
- make go-mod-download
- make build
- make test
after_script:
- make stop-kind

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ IMAGE_NAME := $(BIN)

IMAGE := $(REGISTRY)/$(IMAGE_NAME)

BUILD_IMAGE ?= kanisterio/build:v0.0.3
BUILD_IMAGE ?= kanisterio/build:v0.0.4
DOCS_BUILD_IMAGE ?= kanisterio/docker-sphinx

DOCS_RELEASE_BUCKET ?= s3://docs.kanister.io
Expand Down
2 changes: 1 addition & 1 deletion docker/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPY --from=bitnami/kubectl:1.13.4 /opt/bitnami/kubectl/bin/kubectl /usr/local/b

COPY --from=goreleaser/goreleaser:v0.115.0 /bin/goreleaser /usr/local/bin/

RUN wget -O /usr/local/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-darwin-amd64 \
RUN wget -O /usr/local/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64 \
&& chmod +x /usr/local/bin/kind

ENV CGO_ENABLED=0 \
Expand Down

0 comments on commit 47958b4

Please sign in to comment.