Deal with missing make in docker image, fix typo

eksctl-io · Jun 5, 2018 · 56ed5bf · 56ed5bf
1 parent 11c792f
commit 56ed5bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,22 +1,16 @@
 version: 2
 jobs:
  test:
-   docker:
-     # https://circleci.com/docs/2.0/building-docker-images/#docker-version
-     - image: docker:17.11.0-ce
+   # use machine build, as otherwise we cannot use make and have to duplicate makefile
+   machine: true
    steps:
      - checkout
-     - setup_remote_docker: {docker_layer_caching: true}
-     # just a simple build for now, but will use skaffold if it gets more complex
      # TODO(p3): run unit tests
      - run: make eksctl_image
  build:
-   docker:
-     # https://circleci.com/docs/2.0/building-docker-images/#docker-version
-     - image: docker:17.11.0-ce
+   machine: true
    steps:
      - checkout
-     - setup_remote_docker: {docker_layer_caching: true}
      - run:
         name: Build and publish
         command: |

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ eksctl_image: eksctl_build_image
 
 release: eksctl_build_image
 	docker run \
-	  --env=GIHUB_TOKEN \
+	  --env=GITHUB_TOKEN \
 	  --volume=$(CURDIR):/go/src/github.com/weaveworks/eksctl \
 	  --workdir=/go/src/github.com/weaveworks/eksctl \
 	    eksctl_build \