try to support arm64

Edirom · May 23, 2022 · 4af7291 · 4af7291
1 parent 6ff4b39
commit 4af7291
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -30,10 +30,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - EXISTDB_IMAGE: existdb/existdb:6.0.1
+          - EXISTDB_IMAGE: duncdrum/existdb:6.0.1
             IMAGE_TAG_SUFFIX:
+            PLATFORMS: |
+              linux/amd64
+              linux/arm64
           - EXISTDB_IMAGE: acdhch/existdb:6.0.1-java11-ShenGC
             IMAGE_TAG_SUFFIX: -java11-ShenGC
+            PLATFORMS: |
+              linux/amd64
     
     steps:
       - name: Checkout repository
@@ -42,6 +47,12 @@ jobs:
           # fetch all history to include latest tag for the git revision info
           fetch-depth: 0
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Log in to GitHub Container registry
         uses: docker/login-action@v1
         with:
@@ -76,6 +87,7 @@ jobs:
         with:
           context: .
           load: true
+          platforms: ${{ matrix.PLATFORMS }}
           build-args: |
            EXISTDB_IMAGE=${{ matrix.EXISTDB_IMAGE }}
           tags: ${{ steps.meta.outputs.tags }}
@@ -97,6 +109,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
+          platforms: ${{ matrix.PLATFORMS }}
           build-args: |
            EXISTDB_IMAGE=${{ matrix.EXISTDB_IMAGE }}
           push: ${{ github.event_name != 'pull_request' }}

diff --git a/Dockerfile b/Dockerfile
@@ -47,7 +47,7 @@ RUN ant
 #########################
 FROM ${EXISTDB_IMAGE}
 
-ENV CLASSPATH=/exist/lib/exist.uber.jar:/exist/lib/orbeon-xforms-filter.jar
+ENV CLASSPATH=/exist/lib/*
 
 # add xar dependencies to the autodeploy folder 
 ADD http://exist-db.org/exist/apps/public-repo/public/shared-resources-0.9.1.xar ${EXIST_HOME}/autodeploy
@@ -62,7 +62,7 @@ COPY jetty-exist-additional-config/etc/jetty/webapps/portal/WEB-INF/* ${EXIST_HO
 COPY --from=builder /orbeon-xforms-filter/WEB-INF/lib/orbeon-xforms-filter.jar ${EXIST_HOME}/lib/
 COPY jetty-exist-additional-config/etc/webapp/WEB-INF/*.xml ${EXIST_HOME}/etc/webapp/WEB-INF/
 COPY orbeon-additional-config/WEB-INF/resources/config/* ${EXIST_HOME}/etc/jetty/webapps/orbeon/WEB-INF/resources/config/
-RUN ["java", "-cp", "/exist/lib/exist.uber.jar", "net.sf.saxon.Transform", "-s:/exist/etc/log4j2.xml", "-xsl:/exist/etc/jetty/webapps/orbeon/WEB-INF/resources/config/log4j2-patch.xsl", "-o:/exist/etc/log4j2.xml"]
+RUN ["java", "net.sf.saxon.Transform", "-s:/exist/etc/log4j2.xml", "-xsl:/exist/etc/jetty/webapps/orbeon/WEB-INF/resources/config/log4j2-patch.xsl", "-o:/exist/etc/log4j2.xml"]
 
 # install all the default application XAR so startup is faster. See tei-publisher's Dockerfile
 # pre-populate the database by launching it once