Multistage Docker + Test in Docker

This updates the force dockerfile to be a multistage image allowing us to use the same container for testing.
artsy · Sep 25, 2020 · 46da2aa · 46da2aa
1 parent 11af7e2
commit 46da2aa
Show file tree

Hide file tree

Showing 14 changed files with 442 additions and 243 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,92 +6,45 @@ orbs:
   horizon: artsy/release@0.0.1
   node: artsy/node@1.0.0
   yarn: artsy/yarn@5.1.3
+  artsy-remote-docker: artsy/remote-docker@dev:612b35f7058aed43d189438a46cdeee8
 
 jobs:
-  run_deepcrawl_automator:
-    docker:
-      - image: cimg/base:2020.09
-    environment:
-      AUTOMATOR_START_ONLY: true
-    steps:
-      - run:
-          name: Download automator script
-          command: curl https://raw.githubusercontent.com/deepcrawl/automator-sdk/master/ci.sh --output automator.sh
-      - run:
-          name: Start automator crawl
-          command: chmod +x automator.sh && ./automator.sh
-  acceptance_cypress:
-    docker:
-      - image: circleci/node:12-stretch-browsers
+  mocha:
+    executor: hokusai/deploy
     steps:
-      - yarn/setup
-      - run:
-          name: Cypress Tests
-          command: yarn test:smoke
+      - hokusai/setup-docker
+      - run: hokusai registry pull --tag "$CIRCLE_SHA1"
+      - run: docker run --rm -e NODE_ENV=test --entrypoint /bin/bash "hokusai_force" /usr/local/bin/yarn test:mocha
 
-  validate_production_schema:
-    executor: node/build
+  jest:
+    executor: hokusai/deploy
     steps:
-      - yarn/setup
-      - run:
-          name: Validate Production Schema
-          command: node scripts/validateSchemas.js production
+      - hokusai/setup-docker
+      - run: hokusai registry pull --tag "$CIRCLE_SHA1"
+      - run: docker run --rm -e NODE_ENV=test --entrypoint /bin/bash "hokusai_force" /usr/local/bin/yarn test:jest
 
-  build:
-    executor: node/build
+  type-check:
+    executor: hokusai/deploy
     steps:
-      - yarn/setup
-      - run:
-          name: Build force assets
-          command: yarn assets
-      - store_artifacts:
-          path: ~/project/.artifacts
-      - run:
-          name: Duplicates Report
-          command: curl "https://artsy-dupe-report.now.sh/packages/dupe-report/now.js?owner=artsy&repo=force&buildNum=$CIRCLE_BUILD_NUM"
-
-  # FIXME: Reenable after https://github.com/artsy/force/pull/5673 is addressed
-  # danger:
-  #   executor: node/build
-  #   steps:
-  #     - yarn/setup
-  #     - run:
-  #         name: Danger
-  #         # Formatted this way to prevent GitHub's token detection. This is intended to be committed and public.
-  #         command: DANGER_GITHUB_API_TOKEN="3f715685d9d032e17""48c3368dc8f22c672849136" yarn danger ci
+      - hokusai/setup-docker
+      - run: hokusai registry pull --tag "$CIRCLE_SHA1"
+      - run: docker run --rm -e NODE_ENV=test --entrypoint /bin/bash "hokusai_force" /usr/local/bin/yarn type-check
 
-  create_or_update_review_app:
+  acceptance:
     executor: hokusai/deploy
     steps:
       - hokusai/setup-docker
-      - hokusai/install-aws-iam-authenticator
-      - hokusai/configure-hokusai
-      - run:
-          name: Install jq
-          command: curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 > /usr/local/bin/jq
-      - run:
-          name: Make jq executable
-          command: chmod u+x /usr/local/bin/jq
-      - run:
-          name: "Create or update review app"
-          command: |
-            review_app_name=$(echo $CIRCLE_BRANCH | sed 's/review-app-//')
-
-            kubectl config use-context staging
-
-            if $(kubectl get namespace | grep -qi $review_app_name); then
-              ./scripts/update_review_app.sh $review_app_name
-            else
-              ./scripts/build_review_app.sh $review_app_name
-            fi
+      - run: hokusai registry pull --tag "$CIRCLE_SHA1"
+      - run: docker build -t electron-runner -f electron.Dockerfile .
+      - run: docker run --rm --entrypoint /app/scripts/xvfb-run.sh electron-runner /usr/local/bin/yarn test:acceptance
 
-not_master_or_staging_or_release: &not_master_or_staging_or_release
-  filters:
-    branches:
-      ignore:
-        - master
-        - staging
-        - release
+  acceptance-cypress:
+    executor: hokusai/deploy
+    steps:
+      - hokusai/setup-docker
+      - run: hokusai registry pull --tag "$CIRCLE_SHA1"
+      - run: docker build -t electron-runner -f electron.Dockerfile .
+      - run: docker run --rm --entrypoint /app/scripts/xvfb-run.sh electron-runner /usr/local/bin/yarn test:smoke
 
 not_staging_or_release: &not_staging_or_release
   filters:
@@ -100,108 +53,56 @@ not_staging_or_release: &not_staging_or_release
         - staging
         - release
 
-only_master: &only_master
-  context: hokusai
-  filters:
-    branches:
-      only: master
-
-only_release: &only_release
-  context: hokusai
-  filters:
-    branches:
-      only: release
-
 workflows:
-  default:
+  build-deploy:
     jobs:
-      - horizon/block:
-          <<: *only_release
-          context: horizon
-          project_id: 11
-
-      # Pre-staging
-      - yarn/jest:
+      - artsy-remote-docker/build:
           <<: *not_staging_or_release
-          args: --runInBand
+          context: hokusai
+          name: build
+          pre-steps:
+            - run:
+                command: echo 'export BUILD_TARGET="builder"; export DOCKER_BUILDKIT=1; export BUILDKIT_PROGRESS=plain; export COMPOSE_DOCKER_CLI_BUILD=1;' >> $BASH_ENV
 
-      - yarn/run:
+      - mocha:
           <<: *not_staging_or_release
-          name: test:mocha
-          script: "test:mocha"
-
-      # TODO: Disabled due to memory issues. Can we use our workflows above and
-      # upload coverage that way (similar to reaction). We save a lot of time
-      # by running outside of an unnecessary docker context.
-
-      # - hokusai/test:
-      #     name: test
-      #     <<: *not_staging_or_release
-      #     post-steps:
-      #       - run: mkdir -p ./coverage ./.nyc_output ./reports
-      #       - run:
-      #           name: Copy jest coverage artifacts
-      #           command: docker cp hokusai_force_1:/app/coverage ./
-      #           when: always
-      #       - codecov/upload:
-      #           file: ./coverage/lcov.info
-      #       - run:
-      #           name: Copy mocha coverage artifacts
-      #           command: docker cp hokusai_force_1:/app/.nyc_output ./
-      #           when: always
-      #       - codecov/upload:
-      #           file: ./.nyc_output/lcov.info
-      #       - run:
-      #           name: Copy coverage reports
-      #           command: docker cp hokusai_force_1:/app/reports ./
-      #           when: always
-      #       - store_test_results:
-      #           path: ./reports
+          context: hokusai
+          requires:
+            - build
 
-      - yarn/update-cache:
-          <<: *not_staging_or_release
-      - yarn/type-check:
-          <<: *not_staging_or_release
-      - acceptance_cypress:
-          <<: *not_master_or_staging_or_release
-      - build:
+      - jest:
           <<: *not_staging_or_release
-      # - danger:
-      #     <<: *not_staging_or_release
-
-      # Staging
-      - hokusai/push:
-          name: push-staging-image
-          <<: *only_master
+          context: hokusai
           requires:
-            - yarn/jest
-            - test:mocha
             - build
 
-      - hokusai/deploy-staging:
-          <<: *only_master
-          name: deploy-staging
-          project-name: force
+      - type-check:
+          <<: *not_staging_or_release
+          context: hokusai
           requires:
-            - push-staging-image
+            - build
 
-      # Release
-      - validate_production_schema:
-          <<: *only_release
-      - hokusai/deploy-production:
-          <<: *only_release
-          name: deploy-production
+      - acceptance:
+          <<: *not_staging_or_release
+          context: hokusai
           requires:
-            - horizon/block
-            - validate_production_schema
+            - build
 
-      - run_deepcrawl_automator:
-          context: deepcrawl-automator
+      - acceptance-cypress:
+          <<: *not_staging_or_release
+          context: hokusai
           requires:
-            - deploy-production
+            - build
 
-      - create_or_update_review_app:
-          context: hokusai
-          filters:
-            branches:
-              only: /^review-app-.*/
+      - hokusai/push:
+          name: push-staging-image
+          <<: *not_staging_or_release
+          requires:
+            - mocha
+            - jest
+            - type-check
+            - acceptance
+            - acceptance-cypress
+          pre-steps:
+            - run:
+                command: echo 'export BUILD_TARGET="production"' >> $BASH_ENV
diff --git a/.dockerignore b/.dockerignore
@@ -1,23 +1,36 @@
-.git
-.gitignore
-.dockerignore
-Dockerfile
-hokusai
+# Prefer excluding all assets by default. It prevents large artifacts from
+# accidentally becomming part of the Docker context.
+*
 
-README.md
-LICENSE
-VERSION
-docs
+# CI
+!scripts/
 
-.DS_Store
-.AppleDouble
-.LSOverride
+# Source
+!data/
+!patches/
+!src/
+!webpack/
 
-.env
-.env.*
+# Testing
+!__mocks__/
+!cypress/
 !.env.oss
-log
-tmp
-node_modules
-.vscode
-redis.conf
+!.env.test
+
+# Build Configuration
+!.eslintrc.js
+!.nvmrc
+!.prettierignore
+!apollo.config.js
+!babel.config.js
+!coffeelint.json
+!cypress.json
+!dangerfile.ts
+!jest.config.js
+!package.json
+!relay.config.js
+!renovate.json
+!test.config.js
+!test.mocha.js
+!tsconfig.json
+!yarn.lock