Merge pull request #1700 from tulibraries/qa

Update master with latest qa changes.
tulibraries · Feb 26, 2020 · b89ecb1 · b89ecb1
2 parents 0396bc4 + 1f0616c
commit b89ecb1
Show file tree

Hide file tree

Showing 83 changed files with 589 additions and 3,023 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -43,19 +43,23 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Set up local Solr.
-          command: SOLR_VERSION=6.6.1 bash .circleci/setup_solr.sh
-      - run:
-          name: Set ruby version to 2.6.5
+          name: Install Docker Compose
           command: |
-            rvm install 2.6.5
-            echo . $(rvm 2.6.5 do rvm env --path) >> $BASH_ENV
+            curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+            chmod +x ~/docker-compose
+            sudo mv ~/docker-compose /usr/local/bin/docker-compose
       - run:
           name: Build app
-          command: NODE_VERSION=v12.13.0 bash .circleci/build.sh
+          command: make up
+      - run:
+          name: Run linter
+          command: make lint
+      - run:
+          name: Run ruby tests
+          command: make test
       - run:
-          name: Run tests
-          command: bash .circleci/test.sh
+          name: Run javascript tests
+          command: make test-js
 
   qa_deploy:
     docker:

diff --git a/.circleci/setup_solr.sh b/.circleci/setup_solr.sh
diff --git a/.circleci/test.sh b/.circleci/test.sh
diff --git a/.docker/app/Dockerfile b/.docker/app/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4.1 as production
+FROM ruby:2.6.5-stretch as production
 RUN \
       wget -qO- https://deb.nodesource.com/setup_9.x | bash - && \
       wget -qO- https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \

diff --git a/.docker/solr/Dockerfile b/.docker/solr/Dockerfile
diff --git a/.docker/sp/Dockerfile b/.docker/sp/Dockerfile
diff --git a/.docker/sp/etc-apache2-sites-enabled/sp.conf b/.docker/sp/etc-apache2-sites-enabled/sp.conf
diff --git a/.docker/sp/etc-apache2-ssl/ca.crt b/.docker/sp/etc-apache2-ssl/ca.crt
diff --git a/.docker/sp/etc-apache2-ssl/ca.csr b/.docker/sp/etc-apache2-ssl/ca.csr
diff --git a/.docker/sp/etc-apache2-ssl/ca.key b/.docker/sp/etc-apache2-ssl/ca.key
diff --git a/.docker/sp/etc-shibboleth/accessError.html b/.docker/sp/etc-shibboleth/accessError.html
diff --git a/.docker/sp/etc-shibboleth/attrChecker.html b/.docker/sp/etc-shibboleth/attrChecker.html