Gets 4.1.1 working

Author: danschmidt5189

.dockerignore

@@ -1,3 +1,7 @@
 .env
-data
+.git
+.github
+.gitignore
+db/dumps/*
+!db/dumps/.keep
 init

.env.example

@@ -1 +1,2 @@
 APPCONFIG_DB_URL=jdbc:mysql://db:3306/archivesspace?useUnicode=true&characterEncoding=UTF-8&user=archivesspace&password=archivesspace
+ARCHIVESSPACE_VERSION="v4.1.1"

.gitignore

@@ -1,3 +1,5 @@
 .env
+db/*
+~db/.keep
 data
 init

Dockerfile

@@ -3,10 +3,10 @@
 # BASE Stage
 FROM ubuntu:noble AS base
 
-ARG ARCHIVESSPACE_VERSION="v4.1.0"
+ARG ARCHIVESSPACE_VERSION="v4.1.1"
 ARG ARCHIVESSPACE_USER_UID="40052"
 ARG ARCHIVESSPACE_USER_GID="40052"
-ARG DWO_PLUGIN_VERSION="v1.13"
+ARG DWO_PLUGIN_VERSION="v2.1"
 ARG MT_PLUGIN_VERSION="v1.5"
 ARG MYSQL_CONNECTOR_VERSION="9.5.0"
 
@@ -73,7 +73,7 @@ FROM base AS final
 COPY --from=aspace --chown=root:archivesspace /opt/app /opt/app
 
 # Copy in our custom config files
-COPY --chown=root:archivesspace files/config/config.rb /opt/app/config/config.rb
+# COPY --chown=root:archivesspace files/config/config.rb /opt/app/config/config.rb
 COPY --chown=root:archivesspace files/plugins/local/frontend/assets/images/* /opt/app/plugins/local/frontend/assets/images/
 COPY --chown=root:archivesspace files/plugins/local/frontend/locales/en.rb /opt/app/plugins/local/frontend/locales/en.rb
 
@@ -88,8 +88,7 @@ COPY --from=material_types --chown=root:archivesspace \
     /opt/app/plugins/material_types
 
 # Install the entrypoint script.
-COPY --chown=root:archivesspace docker-entrypoint.sh /bin/docker-entrypoint.sh
-RUN chmod ug+x /bin/docker-entrypoint.sh
+COPY --chown=root:archivesspace --chmod=ug+x files/docker-entrypoint.sh /bin/docker-entrypoint.sh
 ENTRYPOINT ["/bin/docker-entrypoint.sh"]
 
 USER archivesspace

docker-compose.yml

@@ -1,6 +1,9 @@
 services:
   app: &services_app
-    build: .
+    build:
+      context: .
+      args: &aspace-build-args
+        - ARCHIVESSPACE_VERSION=${ARCHIVESSPACE_VERSION:-v4.1.1}
     user: root
     ports:
       - 8080:8080
@@ -51,8 +54,10 @@ services:
     restart: on-failure
 
   solr:
-    image: solr:9.10
-    command: solr-precreate archivesspace archivesspace
+    build:
+      context: solr
+      args: *aspace-build-args
+    command: solr-precreate archivesspace
     environment:
       # @see https://docs.archivesspace.org/provisioning/solr/#setup-the-environment
       - SOLR_MODULES=analysis-extras
@@ -62,8 +67,7 @@ services:
     ports:
       - 8983:8983
     volumes:
-      - ./solr/conf:/opt/solr/server/solr/configsets/archivesspace/conf:ro
-      - ./solr/data:/var/solr/data
+      - solr_data:/var/solr
     healthcheck:
       test: curl --max-time 10 -f http://localhost:8983/solr/#/~cores/archivesspace || exit 1
       start_period: 10s
@@ -81,9 +85,12 @@ services:
       - MYSQL_PASSWORD=archivesspace
     ports:
       - 3306:3306
+    secrets:
+      - source: root-my.cnf
+        target: /root/.my.cnf
     volumes:
+      - ./db/dumps:/docker-entrypoint-initdb.d:ro
       - db_data:/var/lib/mysql
-      - ./init:/docker-entrypoint-initdb.d
 
 configs:
   config.rb:
@@ -94,6 +101,8 @@ configs:
 secrets:
   APPCONFIG_DB_URL:
     environment: APPCONFIG_DB_URL
+  root-my.cnf:
+    file: files/root-my.cnf
 
 volumes:
   aspace_data: {}

docker-entrypoint.sh files/docker-entrypoint.shdocker-entrypoint.sh renamed to files/docker-entrypoint.sh

@@ -0,0 +1,3 @@
+[client]
+user = root
+password = archivesspace-root

files/root-my.cnf

@@ -0,0 +1,21 @@
+FROM solr:9
+
+ARG ARCHIVESSPACE_VERSION="v4.1.1"
+ENV ARCHIVESSPACE_SOURCE_URL="https://github.com/archivesspace/archivesspace/releases/download/${ARCHIVESSPACE_VERSION}/archivesspace-${ARCHIVESSPACE_VERSION}.zip"
+
+# Upgrade system packages and install wget
+USER root
+RUN apt-get -y update && \
+    apt-get -y upgrade && \
+    apt-get -y install --no-install-recommends \
+      unzip \
+      wget && \
+    rm -rf /var/lib/apt/lists/*
+
+# Create a configset for the given ASpace release
+RUN mkdir -p /opt/solr/server/solr/configsets/archivesspace/conf && \
+    wget -O aspace.zip "$ARCHIVESSPACE_SOURCE_URL" && \
+    unzip aspace.zip 'archivesspace/solr/*' && \
+    mv archivesspace/solr/* /opt/solr/server/solr/configsets/archivesspace/conf/ && \
+    rm -rf aspace.zip archivesspace
+USER solr