refactor CI

psu-libraries · Sep 12, 2022 · d7aa52f · d7aa52f
1 parent 975dc27
commit d7aa52f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,7 @@
 version: 2.1
 
 orbs:
-  docker: circleci/docker@1.5.0
-  browser-tools: circleci/browser-tools@1.4.0
+  docker: circleci/docker@2.1.2
 
 jobs:
   release:
@@ -30,18 +29,29 @@ jobs:
         user: root
     steps:
       - setup_remote_docker:
-          version: 19.03.13
+          version: 20.10.14
       - checkout
       - docker/check:
           registry: harbor.k8s.libraries.psu.edu
       - docker/build:
+          cache_from: harbor.k8s.libraries.psu.edu/library/myaccount:cache
           image: library/myaccount
           registry: harbor.k8s.libraries.psu.edu
+          use-buildkit: true
+          tag: "cache,$CIRCLE_SHA1"
           extra_build_args: "--target production"
+      - docker/build:
+          cache_from: harbor.k8s.libraries.psu.edu/library/myaccount:ci
+          image: library/myaccount
+          registry: harbor.k8s.libraries.psu.edu
+          use-buildkit: true
+          tag: ci
+          extra_build_args: "--target ci"
       - docker/push:
           digest-path: /tmp/digest.txt
           image: library/myaccount
           registry: harbor.k8s.libraries.psu.edu
+          tag: "$CIRCLE_SHA1,ci,cache"
       - run:
           command: |
             echo "Digest is: $(</tmp/digest.txt)"
@@ -61,20 +71,15 @@ jobs:
             ./bin/generate_app
   test:
     docker:
-      - image: cimg/ruby:2.7.6-browsers
+      - image: harbor.k8s.libraries.psu.edu/library/myaccount:ci
       - image: redis:7.0.4-alpine3.16
     environment:
       RAILS_ENV: test
     steps:
-    - browser-tools/install-chrome
-    - browser-tools/install-chromedriver
     - checkout
     - restore_cache:
         keys:
-          - bundle-{{ checksum "Gemfile.lock" }}
-    - run:
-        name: "Wait for Redis"
-        command: dockerize -wait tcp://localhost:6379 -timeout 1m
+          - bundle-{{ checksum "Gemfile.lock" }}-v3
     - run:
         name: "Bundle"
         command: |
@@ -83,16 +88,16 @@ jobs:
     - save_cache:
         paths:
           - vendor/bundle
-        key: bundle-{{ checksum "Gemfile.lock" }} 
+        key: bundle-{{ checksum "Gemfile.lock" }}-v3
     - restore_cache:
         keys:
-          - yarn-{{ checksum "yarn.lock" }}
+          - yarn-{{ checksum "yarn.lock" }}-v3
     - run:
         name: "Yarn"
         command: |
           yarn install --cache-folder ~/.cache/yarn --frozen-lockfile
     - save_cache:
-        key: yarn-{{ checksum "yarn.lock" }}
+        key: yarn-{{ checksum "yarn.lock" }}-v3
         paths:
           - ~/.cache/yarn
     - run:
@@ -134,11 +139,6 @@ workflows:
       - publish:
           context:
             - org-global
-          filters:
-            branches:
-              only:
-                - main
-                - /preview\/.*/
       - deploy:
           context:
             - org-global

diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,7 @@ RUN RAILS_ENV=production \
 CMD ["/app/bin/start"]
 
 
-FROM base as test
+FROM base as ci
 
 USER root
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
@@ -43,6 +43,8 @@ RUN apt-get update && apt-get install -y x11vnc \
 
 USER app
 
+FROM ci as test
+
 RUN bundle
 
 CMD ["sleep", "99999999"]