Refactor and externalize common library code; use embedded solr to ma…

…ke it easy to run without docker (#12)

.circleci/config.yml

@@ -1,31 +1,35 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine.
-# See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 
-# Define a job to be invoked later in a workflow.
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
-  # Below is the definition of your job to build and test your app, you can rename and customize it as you want.
-  build-and-test:
-    # These next lines define a Docker executor: https://circleci.com/docs/2.0/executor-types/
-    # You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
-    # Be sure to update the Docker image tag below to openjdk version of your application.
-    # A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/openjdk
+  test:
     docker:
       - image: cimg/openjdk:11.0
-    # Add steps to the job
-    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
     steps:
-      # Checkout the code as the first step.
       - checkout
-      # Use mvn clean and package as the standard maven build phase
-      - run:
-          name: Build
-          command: mvn -B -DskipTests clean package
-      # Then run your tests!
+
       - run:
           name: Test
-          command: mvn test
+          command: |
+            cd kawa-web-collection
+            git submodule update --init
+            mvn install -DskipTests=true
+            cd ..
+            mvn test
+
+  build:
+    machine: true
+    steps:
+      - checkout
+
+      - run: |
+          cd kawa-web-collection
+          git submodule update --init
+          cd ..
+          docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+          docker build -t arvyy/r7rs-index:$CIRCLE_BRANCH -f docker/Dockerfile .
+
+      - run: docker push arvyy/r7rs-index:$CIRCLE_BRANCH
+
   deploy:
     machine: true
     steps:
@@ -34,13 +38,17 @@ jobs:
           command: |
             ssh $SSH_USER@$SSH_HOST "bash ~/update.sh"
 
-# Invoke jobs via workflows
-# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
 workflows:
-  sample: # This is the name of the workflow, feel free to change it to better match your workflow.
-    # Inside the workflow, you define the jobs you want to run.
+  sample:
     jobs:
-      - build-and-test
+      - test
+      - build:
+          requires:
+            - test
       - deploy:
           requires:
-            - build-and-test
+            - build
+          filters:
+            branches:
+              only:
+                - master

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "kawa-web-collection"]
+	path = kawa-web-collection
+	url = https://github.com/arvyy/kawa-web-collection