From b8ea52e4a0edecaec8cee3d6d52282777cc4dc66 Mon Sep 17 00:00:00 2001
From: Aaron Elkiss <aelkiss@umich.edu>
Date: Tue, 29 Oct 2024 16:39:23 -0400
Subject: [PATCH] Dockerfile updates for traject

* remove wait-for & use health checks
* use production stage
---
 Dockerfile                                    | 27 ++++++++++------
 docker-compose.yml                            | 32 ++++++++++++++++---
 .../ht/collection_code_to_original_from.yaml  | 11 ++-----
 3 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 902df5b..ef9996e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,30 @@
-FROM jruby:9.4-jdk17
+FROM jruby:9.4-jdk17 AS base
 ARG UNAME=app
 ARG UID=1000
 ARG GID=1000
 
 RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
   build-essential \
-  netbase \
-  netcat
+  netbase
 
-RUN groupadd -g ${GID} -o ${UNAME}
-RUN useradd -m -d /app -u ${UID} -g ${GID} -o -s /bin/bash ${UNAME}
-RUN mkdir -p /gems && chown ${UID}:${GID} /gems
-
-# COPY --chown=${UID}:${GID} Gemfile* /app/
 WORKDIR /app
-RUN wget -O /usr/local/bin/wait-for https://github.com/eficode/wait-for/releases/download/v2.2.3/wait-for && chmod +x /usr/local/bin/wait-for
 
 # USER $UNAME
 ENV BUNDLE_PATH /gems
 RUN gem install bundler
+
+FROM base AS development
+
+FROM base AS production
+
+RUN groupadd -g $GID -o $UNAME
+RUN useradd -m -d /app -u $UID -g $GID -o -s /bin/bash $UNAME
+RUN mkdir -p /gems && chown $UID:$GID /gems
+USER $UNAME
+COPY --chown=$UID:$GID Gemfile* /app
+WORKDIR /app
+ENV BUNDLE_PATH /gems
+RUN bundle install
+COPY --chown=$UID:$GID . /app
+
+LABEL org.opencontainers.image.source="https://github.com/hathitrust/hathitrust_catalog_indexer"
diff --git a/docker-compose.yml b/docker-compose.yml
index 9a0c42a..c53d7d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,19 @@
 ---
 
+x-condition-healthy: &healthy
+  condition: service_healthy
+
+x-healthcheck-defaults: &healthcheck-defaults
+  interval: 5s
+  timeout: 10s
+  start_period: 10s
+  retries: 5
+
 services:
   traject:
-    build: .
+    build: 
+      context: .
+      target: development
     volumes:
       - .:/app
       - gem_cache:/gems
@@ -10,29 +21,40 @@ services:
       - SOLR_URL=http://solr-sdr-catalog:9033/solr/catalog
       - redirect_file=/dev/null
       - NO_DB=1
+    network_mode: host
+    command: sleep infinity
 
   test:
-    build: .
+    build: 
+      context: .
+      target: development
     volumes:
       - .:/app
       - gem_cache:/gems
-    command: bash -c "wait-for solr-sdr-catalog:9033 mariadb:3306 && JRUBY_OPTS='--debug' bundle exec rspec"
+    command: bundle exec rspec
     environment:
+      - JRUBY_OPTS=--debug
       - SOLR_URL=http://solr-sdr-catalog:9033/solr/catalog
       - redirect_file=/dev/null
     depends_on:
-      - solr-sdr-catalog
-      - mariadb
+      solr-sdr-catalog: *healthy
+      mariadb: *healthy
 
   solr-sdr-catalog:
     build: solr
     ports:
       - "9033:9033"
+    healthcheck:
+      <<: *healthcheck-defaults
+      test: [ "CMD", "curl","-s","-f","http://localhost:9033/solr/catalog/admin/ping" ]
 
   mariadb:
     image: ghcr.io/hathitrust/db-image:latest
     ports:
       - "3306:3306"
+    healthcheck:
+      <<: *healthcheck-defaults
+      test: [ "CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized" ]
 
 volumes:
   gem_cache:
diff --git a/lib/translation_maps/ht/collection_code_to_original_from.yaml b/lib/translation_maps/ht/collection_code_to_original_from.yaml
index fd6f348..544eeb7 100644
--- a/lib/translation_maps/ht/collection_code_to_original_from.yaml
+++ b/lib/translation_maps/ht/collection_code_to_original_from.yaml
@@ -4,16 +4,13 @@ aubru: The University of Queensland
 aztes: Arizona State University
 chi: University of Chicago
 coo: Cornell University
-cou: University of Colorado Boulder
 ctu: University of Connecticut
 deu: University of Delaware
 fmu: University of Miami
 geu: Emory University
 gri: Getty Research Institute
-gu: University System of Georgia
 gwla: Technical Report Archive &amp; Image Library
 hvd: Harvard University
-iagg: Grinnell College
 iau: University of Iowa
 ibc: Boston College
 iduke: Duke University
@@ -30,8 +27,8 @@ iucla: University of California
 iufl: State University System of Florida
 iuiuc: University of Illinois at Urbana-Champaign
 iunc: University of North Carolina at Chapel Hill
-keio: 'Keio University 慶應義塾大学 '
-lebau: American University of Beirut - الجامعة الأميركيّة في بيروت
+keio: 慶應義塾大学 (Keio University)
+lebau: American University of Beirut
 mdbj: Johns Hopkins University
 mdl: Minnesota Digital Library
 mdu: University of Maryland, College Park
@@ -45,8 +42,6 @@ nbb: Brooklyn Museum
 nbuu: University At Buffalo, The State University of New York
 ncwsw: Wake Forest University
 njp: Princeton University
-njpt: Princeton Theological Seminary
-njr: Rutgers University
 nnc: Columbia University
 nnfr: The Frick Collection
 nrlf: University of California
@@ -65,7 +60,7 @@ srlf: University of California
 tu: University of Tennessee, Knoxville
 txcm: Texas A&amp;M University
 txsmtsu: Texas State University - San Marcos
-txu: The University of Texas
+txu: University of Texas at Austin
 ucbk: University of California
 ucd: University of California
 uci: University of California