switch to building inside docker:latest on CircleCI

jshimko · Aug 16, 2017 · b2aa1dc · b2aa1dc
1 parent ef42a03
commit b2aa1dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,17 +5,14 @@ jobs:
     working_directory: /home/launchpad
 
     docker:
-      - image: debian:jessie
-
-    environment:
-      - DOCKER_VERSION: 17.05.1-ce
+      - image: docker:latest
 
     steps:
       - setup_remote_docker
       - checkout
 
       # install OS dependencies
-      - run: .circleci/install.sh
+      - run: apk update && apk upgrade && apk add --no-cache bash git openssh
 
       # run build test
       - run: .circleci/build.sh

diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh
@@ -26,7 +26,7 @@ if [[ "$CIRCLE_BRANCH" == "master" ]]; then
     docker tag $IMAGE_NAME:latest $IMAGE_NAME:$VERSION
 
     # login to Docker Hub
-    docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+    docker login -u $DOCKER_USER -p $DOCKER_PASS
 
     # push the builds
     docker push $IMAGE_NAME:$VERSION-devbuild

diff --git a/.circleci/install.sh b/.circleci/install.sh