Support new Docker workflow

Author: Daniel Schmidt

Dockerfile

@@ -16,7 +16,6 @@ RUN addgroup -Sg 40023 waam && \
     adduser -Su 40023 -G waam waam && \
     install -d -o waam -g waam /usr/src/app
 
-
 # Subsequent commands run relative to this directory.
 WORKDIR /usr/src/app
 
@@ -25,8 +24,8 @@ RUN chown -Rh waam:waam /home/node
 USER waam
 
 # Install Yarn
-RUN npm i -g corepack 
-    
+RUN npm i -g corepack
+
 # Install server dependencies.
 COPY --chown=waam package.json ./
 COPY --chown=waam yarn.lock ./
@@ -49,3 +48,5 @@ ENTRYPOINT ["npm"]
 
 # The default command runs the server.
 CMD ["run", "server"]
+
+ENV PATH=/usr/src/app/bin:$PATH

bin/generate-authors-search-indexes.js

@@ -0,0 +1 @@
+#!/bin/sh -e

bin/generate-manuscripts-search-indexes.js

@@ -0,0 +1,3 @@
+#!/bin/sh -e
+
+wget localhost:3002 -O - 2> /dev/null | grep -q 'West African'

bin/setup

@@ -0,0 +1,6 @@
+---
+
+services:
+  app:
+    build: !reset
+    image: "${DOCKER_APP_IMAGE}"

bin/test

@@ -1,37 +1,35 @@
-version: '3.7'
+---
+
 services:
-  node:
-    container_name: node
-    build:
-      context: .
-      dockerfile: Dockerfile
+  app:
+    build: .
     restart: always
     ports:
       - 3002:3002
     secrets:
       - DATABASE_URL
 
   db:
-    image: mariadb:10.5.8
-    container_name: db
+    image: mariadb:10
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_USER: amms2
-      MYSQL_PASSWORD: amms2
-      MYSQL_DATABASE: amms2
+      - MYSQL_DATABASE=amms2
+      - MYSQL_PASSWORD=amms2
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_USER=amms2
     volumes:
       - db-volume:/var/lib/mysql
       - ./data/test-data.sql:/docker-entrypoint-initdb.d/test-data.sql
     depends_on:
-      - node
+      - app
 
 networks:
   default:
     driver: bridge
+
 secrets:
   DATABASE_URL:
     file: secrets/DATABASE_URL
 
 volumes:
-  db-volume:
+  db-volume: