Merge pull request #4867 from willkg/1540248-dc-ci

bug 1540248: fix setting up docker-compose in CI
mozilla-services · Mar 30, 2019 · f3dd390 · f3dd390
2 parents 1837e14 + 7f88ecd
commit f3dd390
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,23 +2,17 @@ version: 2
 jobs:
   build:
     docker:
-      - image: docker:stable
+      - image: mozilla/cidockerbases:docker-latest
     working_directory: /
+
     steps:
+      - run:
+          name: Host info
+          command: uname -v
+
       - run:
           name: Install essential packages
-          command: |
-            apk update
-            apk add --update --no-cache \
-                    ca-certificates \
-                    build-base \
-                    bash \
-                    make \
-                    git \
-                    openssh \
-                    docker \
-                    py-pip
-            pip install docker-compose
+          command: apt-get install make
 
       - checkout:
           path: /socorro
@@ -40,11 +34,17 @@ jobs:
 
       - setup_remote_docker
 
+      - run:
+          name: Get info
+          command: |
+            docker info
+            which docker-compose
+            docker-compose --version
+
       - run:
           name: Build Docker images
           working_directory: /socorro
           command: |
-            docker info
             make build
 
       - run: