feat: arm64 support and bump Obsidian version (#118)

* feat: arm64 support
using buildkit variables and AppImages for a multi-arch Dockerfile, based on Dockerfile.arm64

* chore: bump Obsidian version to 1.8.10

Author: pl4nty

.github/workflows/docker-publish.yml

@@ -49,6 +49,7 @@ jobs:
         with:
           context: .
           #file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
           push: true # Will only build if this is not here
           #tags: ghcr.io/${{ github.repository_owner }}/obsidian-remote:latest
           # build-args: |

.github/workflows/docker.yml

@@ -56,21 +56,9 @@ jobs:
         with:
           context: .
           file: Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:latest
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:buildcache_amd64
-          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:buildcache_amd64,mode=max
-
-#      - name: Build and push Docker images
-#        uses: docker/build-push-action@v5
-#        with:
-#          context: .
-#          file: Dockerfile.arm64
-#          platforms: linux/arm64
-#          push: true
-#          tags: ${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:arm64
-#          labels: ${{ steps.meta.outputs.labels }}
-#          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:buildcache_arm64
-#          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:buildcache_arm64,mode=max          
+          cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:buildcache
+          cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:buildcache,mode=max

Dockerfile

@@ -7,27 +7,32 @@ LABEL maintainer="github@sytone.com" \
       org.opencontainers.image.description="Hosted Obsidian instance allowing access via web browser"
 
 # Set version label
-ARG OBSIDIAN_VERSION=1.7.7
+ARG OBSIDIAN_VERSION=1.8.10
 
 # Update and install extra packages
 RUN echo "**** install packages ****" && \
     apt-get update && \
-    apt-get install -y --no-install-recommends curl libgtk-3-0 libnotify4 libatspi2.0-0 libsecret-1-0 libnss3 desktop-file-utils fonts-noto-color-emoji git ssh-askpass && \
-    apt-get autoclean && rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/*
+    apt-get install -y --no-install-recommends curl libnss3 zlib1g-dev dbus-x11 uuid-runtime \
+    libfuse2 libatk1.0-0 libatk-bridge2.0-0 libcups2 libgtk-3-0 && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/*
 
 # Download and install Obsidian
+ARG TARGETARCH
+ARG FLAG=${TARGETARCH#amd64}
 RUN echo "**** download obsidian ****" && \
-    curl --location --output obsidian.deb "https://github.com/obsidianmd/obsidian-releases/releases/download/v${OBSIDIAN_VERSION}/obsidian_${OBSIDIAN_VERSION}_amd64.deb" && \
-    dpkg -i obsidian.deb && \
-    rm obsidian.deb
+    curl -L -o ./obsidian.AppImage \
+        "https://github.com/obsidianmd/obsidian-releases/releases/download/v${OBSIDIAN_VERSION}/Obsidian-${OBSIDIAN_VERSION}${FLAG:+-arm64}.AppImage" && \
+    chmod +x ./obsidian.AppImage && \
+    ./obsidian.AppImage --appimage-extract && \
+    rm ./obsidian.AppImage
 
 # Environment variables
 ENV CUSTOM_PORT="8080" \
     CUSTOM_HTTPS_PORT="8443" \
     CUSTOM_USER="" \
     PASSWORD="" \
     SUBFOLDER="" \
-    TITLE="Obsidian v${OBSIDIAN_VERSION}" \
+    TITLE="Obsidian v$OBSIDIAN_VERSION" \
     FM_HOME="/vaults"
 
 # Add local files

Dockerfile.arm64

@@ -1 +1 @@
-sudo /usr/bin/obsidian --no-sandbox --no-xshm --disable-dev-shm-usage --disable-gpu --disable-software-rasterizer
+sudo /squashfs-root/obsidian --no-sandbox --no-xshm --disable-dev-shm-usage --disable-gpu --disable-software-rasterizer

root/defaults/autostart

@@ -3,7 +3,7 @@
     <menu id="root-menu" label="MENU">
         <item label="Obsidian" icon="/usr/share/icons/hicolor/48x48/apps/obsidian.png">
             <action name="Execute">
-                <command>sudo /usr/bin/obsidian --no-sandbox</command>
+                <command>sudo /squashfs-root/obsidian --no-sandbox --no-xshm --disable-dev-shm-usage --disable-gpu --disable-software-rasterizer</command>
             </action>
         </item>
         <item label="xterm" icon="/usr/share/pixmaps/xterm-color_48x48.xpm">