Ftr/local development

.github/workflows/add-new-issues-and-prs-to-project.yml

@@ -11,7 +11,7 @@ jobs:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v1.0.2
+      - uses: actions/add-to-project@v2.0.0
         with:
           project-url: https://github.com/orgs/Edirom/projects/4
           github-token: ${{ secrets.ADD_TO_PROJECT_TOKEN }}

.github/workflows/pre-release.yml

@@ -20,12 +20,12 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
       with:
         submodules: 'recursive'
 
     - name: Get short sha
-      uses: benjlevesque/short-sha@v3.0
+      uses: benjlevesque/short-sha@v4.0
       id: short-sha
       with:
         length: 7       
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
       - name: Install libsaxonhe-java for XQuery support
         run: |
           sudo apt-get update
@@ -70,7 +70,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
     - name: Install libxml2-utils for xmllint
       run: |
         sudo apt-get update
@@ -104,7 +104,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
     - name: Delete dev-release
       run: gh release delete dev --cleanup-tag -y
       env:

.github/workflows/update-citation.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Update or add commit and date-released fields
         run: |

backend/Dockerfile

@@ -10,36 +10,12 @@
 # 1. Build Environment
 #########################
 
-FROM eclipse-temurin:21 as builder
+FROM edirom-online-builder:latest AS eo-builder
 
-ARG ANT_VERSION=1.10.12
 ARG SOURCE=https://github.com/Edirom/Edirom-Online-Backend.git
 ARG BRANCH=v1.3.0
 ARG EDITION
-
-
-# Install wget and unzip and ruby and other dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        curl \
-        sudo \
-        wget \
-        git \
-        unzip \
-		libfreetype6 \
-		fontconfig \
-	&& rm -rf /var/lib/apt/lists/*
-
-# Download and extract Apache Ant to opt folder
-RUN wget --no-check-certificate --no-cookies http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    wget --no-check-certificate --no-cookies http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz.sha512 && \
-    echo "$(cat apache-ant-${ANT_VERSION}-bin.tar.gz.sha512) apache-ant-${ANT_VERSION}-bin.tar.gz" | sha512sum -c && \
-    tar -zvxf apache-ant-${ANT_VERSION}-bin.tar.gz -C /opt/ && \
-    ln -s /opt/apache-ant-${ANT_VERSION} /opt/ant && \
-    unlink apache-ant-${ANT_VERSION}-bin.tar.gz && \
-    unlink apache-ant-${ANT_VERSION}-bin.tar.gz.sha512
-
-# Put ant in the path
-ENV PATH="/opt/ant/bin:${PATH}"
+ARG ROASTER_VERSION=1.11.0
 
 
 ###########################
@@ -54,6 +30,7 @@ RUN echo "Cloning from repo $SOURCE" && \
     echo "Building Backend XAR..." && \
     ant
 
+# Download edition XAR if specified
 RUN if [ -n "$EDITION" ]; then \
         echo "Downloading Edition XAR from $EDITION" && \
         mkdir -p /opt/eo-editions && \
@@ -64,6 +41,11 @@ RUN if [ -n "$EDITION" ]; then \
         echo "Note: EDITION_XAR not provided. Please add manually to eXist-db."; \
     fi
 
+RUN echo "Downloading dependencies..." && \
+    mkdir -p /opt/roaster && \
+    cd /opt/roaster && \
+    curl -L -O "https://exist-db.org/exist/apps/public-repo/public/roaster-${ROASTER_VERSION}.xar";
+
 
 #########################
 # 3. Run/deploy eXist-db
@@ -76,5 +58,6 @@ ENV EXIST_PASSWORD=changeme
 ADD ./autodeploy ${EXIST_HOME}/autodeploy/
 
 # copy built XARs to autodeploy directory of exist
-COPY --from=builder /opt/eo-backend/build-xar/*.xar ${EXIST_HOME}/autodeploy/
-COPY --from=builder /opt/eo-editions/*.xar ${EXIST_HOME}/autodeploy/
+COPY --from=eo-builder /opt/eo-backend/build-xar/*.xar ${EXIST_HOME}/autodeploy/
+COPY --from=eo-builder /opt/eo-editions/*.xar ${EXIST_HOME}/autodeploy/
+COPY --from=builder /opt/roaster/*.xar ${EXIST_HOME}/autodeploy/

backend/Dockerfile.local

@@ -0,0 +1,57 @@
+########################################
+# Local dev: Multi-stage Dockerfile
+# Uses mounted local frontend source
+# 1. Set up the build environment
+# 2. Build Edirom-Online packages
+# 3. Run the eXist-db and deploy XARs
+#######################################
+
+
+#########################
+# 1. Build Environment
+#########################
+
+# Use shared builder image
+FROM edirom-online-builder:latest AS eo-builder
+
+ARG EDITION
+
+###########################
+# 2. Edirom-Online Backend
+###########################
+
+# Get build for Edirom-Online-Backend
+WORKDIR /opt/eo-backend
+
+# Copy source code from build context (BE_LOCAL_SOURCE)
+COPY . .
+
+# Build the local source (clean build-xar first to avoid stale XARs in autodeploy)
+RUN echo "Building Backend XAR from local source..." && \
+    rm -f build-xar/*.xar && \
+    ant
+
+# Download edition XAR if specified
+RUN if [ -n "$EDITION" ]; then \
+        echo "Downloading Edition XAR from $EDITION" && \
+        mkdir -p /opt/eo-editions && \
+        cd /opt/eo-editions && \
+        curl -L -O "$EDITION"; \
+    else \
+        mkdir -p /opt/eo-editions && \
+        echo "Note: EDITION_XAR not provided. Please add manually to eXist-db."; \
+    fi
+
+#########################
+# 3. Run/deploy eXist-db
+#########################
+
+FROM stadlerpeter/existdb:6
+ENV EXIST_PASSWORD=changeme
+
+# add XARs to autodeploy directory of exist (from additional_contexts)
+COPY --from=backend ./autodeploy ${EXIST_HOME}/autodeploy/
+
+# copy built XARs to autodeploy directory of exist
+COPY --from=eo-builder /opt/eo-backend/build-xar/*.xar ${EXIST_HOME}/autodeploy/
+COPY --from=eo-builder /opt/eo-editions/*.xar ${EXIST_HOME}/autodeploy/

builder/Dockerfile

@@ -0,0 +1,61 @@
+#############################################################
+# Builder Environment Dockerfile
+# Interactive build environment for local development
+# Keeps build tools and dependencies alive for fast iteration
+# Note: Uses Java 8 for Sencha Cmd (frontend) compatibility
+#############################################################
+
+# Use Java 8 for Sencha Cmd compatibility (requires Nashorn JavaScript engine)
+FROM eclipse-temurin:8-jdk-focal
+
+ARG ANT_VERSION=1.10.12
+
+# Install build dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+        curl \
+        sudo \
+        wget \
+        git \
+        unzip \
+        libfreetype6 \
+        fontconfig \
+        ruby-full \
+        vim \
+        less \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download and extract Apache Ant to opt folder
+# Use cache mount to persist downloads across builds
+RUN --mount=type=cache,target=/var/cache/downloads \
+    if [ ! -f /var/cache/downloads/apache-ant-${ANT_VERSION}-bin.tar.gz ]; then \
+        wget --no-check-certificate --no-cookies http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz -O /var/cache/downloads/apache-ant-${ANT_VERSION}-bin.tar.gz && \
+        wget --no-check-certificate --no-cookies http://archive.apache.org/dist/ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.gz.sha512 -O /var/cache/downloads/apache-ant-${ANT_VERSION}-bin.tar.gz.sha512; \
+    fi && \
+    cd /var/cache/downloads && \
+    echo "$(cat apache-ant-${ANT_VERSION}-bin.tar.gz.sha512) apache-ant-${ANT_VERSION}-bin.tar.gz" | sha512sum -c && \
+    tar -zvxf /var/cache/downloads/apache-ant-${ANT_VERSION}-bin.tar.gz -C /opt/ && \
+    ln -s /opt/apache-ant-${ANT_VERSION} /opt/ant
+
+# Download and install SenchaCmd Community Edition
+# Use cache mount to persist downloads across builds
+RUN --mount=type=cache,target=/var/cache/downloads \
+    if [ ! -f /var/cache/downloads/senchaCmd.zip ]; then \
+        curl --silent http://cdn.sencha.com/cmd/7.0.0.40/no-jre/SenchaCmd-7.0.0.40-linux-amd64.sh.zip -o /var/cache/downloads/senchaCmd.zip; \
+    fi && \
+    unzip /var/cache/downloads/senchaCmd.zip -d /tmp && \
+    chmod o+x /tmp/SenchaCmd-7.0.0.40-linux-amd64.sh && \
+    /tmp/SenchaCmd-7.0.0.40-linux-amd64.sh -Dall=true -q -dir /opt/Sencha/Cmd/7.0.0.40 && \
+    rm /tmp/SenchaCmd-7.0.0.40-linux-amd64.sh
+
+# Put ant and sencha in the path
+ENV PATH="/opt/ant/bin:/opt/Sencha/Cmd:${PATH}"
+
+# Install eo task runner (available as 'eo' anywhere in the container)
+COPY eo /usr/local/bin/eo
+RUN chmod +x /usr/local/bin/eo
+
+# Set working directory where source will be mounted
+WORKDIR /opt/eo-frontend
+
+# Keep container running with bash
+CMD ["/bin/bash"]