update docker images and cache for faster tests (#42)

chanzuckerberg · Jan 31, 2022 · 747d232 · 747d232
1 parent 69ef772
commit 747d232
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/sfn-wdl-ci.yml b/.github/workflows/sfn-wdl-ci.yml
@@ -39,11 +39,10 @@ jobs:
         run: |
           source scripts/init_ci_runner.sh
           source environment.test
-          # TODO: remove moto hack once change is merged
-          git clone https://github.com/morsecodist/moto.git ; cd moto ; git checkout tmorse-docker-networks ; docker build -t moto_local . ; cd .. ; rm -rf moto
-          docker build -t ghcr.io/chanzuckerberg/swipe:$(cat version) .
-          scripts/run_mock_server.sh &
-          for i in {1..60}; do if timeout 1 bash -c "echo > /dev/tcp/localhost/9000"; then break; elif [[ $i == 60 ]]; then exit 1; else sleep 1; fi; done
+          docker pull ghcr.io/chanzuckerberg/swipe:latest
+          docker build --cache-from ghcr.io/chanzuckerberg/swipe:latest -t ghcr.io/chanzuckerberg/swipe:$(cat version) .
+          docker-compose pull
+          docker-compose up &
           make deploy-mock test
 
   terraform_format:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,9 +3,10 @@ version: "3.8"
 services:
   motoserver:
     container_name: motoserver
-    image: moto_local
+    image: motoserver/moto
     environment:
-      - MOTO_DOCKER_NETWORK=awsnet
+      - MOTO_DOCKER_NETWORK_NAME=awsnet
+      - MOTO_DOCKER_NETWORK_MODE=overlay
     ports:
       - "9000:5000"
     volumes:

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,4 @@
-awscli
 boto3
 flake8
 mypy
-yq
+yq
diff --git a/scripts/run_mock_server.sh b/scripts/run_mock_server.sh
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
-    awscli
     boto3
     flake8
     mypy
-    yq
+    yq