From 2625d8510d0ac487c4d0bb7fb4e386642c012937 Mon Sep 17 00:00:00 2001
From: Kalyan Mudumby <71078441+theinhumaneme@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:23:40 +0530
Subject: [PATCH] fix actions, fix Dockerfile, update Obsidian to latest
 version 1.7.7 (#107)

* update Dockerfile

* update Dockerfile.arm64

* update workflows
---
 .github/workflows/docker.yml | 24 ++++++++++++------------
 Dockerfile                   |  6 +++---
 Dockerfile.arm64             |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c5cddcf..83a043a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -55,7 +55,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: dockerfile.amd64
+          file: Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote:latest
@@ -63,14 +63,14 @@ jobs:
           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          
+     - 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          
diff --git a/Dockerfile b/Dockerfile
index e361ca6..5e6c76d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbullseye
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm
 
 LABEL maintainer="github@sytone.com" \
       org.opencontainers.image.authors="github@sytone.com" \
@@ -7,7 +7,7 @@ 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.4
+ARG OBSIDIAN_VERSION=1.7.7
 
 # Update and install extra packages
 RUN echo "**** install packages ****" && \
@@ -38,4 +38,4 @@ EXPOSE 8080 8443
 VOLUME ["/config","/vaults"]
 
 # Define a healthcheck
-HEALTHCHECK CMD /bin/sh -c 'if [ -z "$CUSTOM_USER" ] || [ -z "$PASSWORD" ]; then curl --fail http://localhost:8080/ || exit 1; else curl --fail --user "$CUSTOM_USER:$PASSWORD" http://localhost:8080/ || exit 1; fi'
+HEALTHCHECK CMD /bin/sh -c 'if [ -z "$CUSTOM_USER" ] || [ -z "$PASSWORD" ]; then curl --fail http://localhost:8080/ || exit 1; else curl --fail --user "$CUSTOM_USER:$PASSWORD" http://localhost:8080/ || exit 1; fi'
\ No newline at end of file
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 5f308bc..97dcf99 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbullseye
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm
 
 LABEL maintainer="github@sytone.com" \
       org.opencontainers.image.authors="github@sytone.com" \
@@ -7,7 +7,7 @@ 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.4
+ARG OBSIDIAN_VERSION=1.7.7
 ARG ARCH=arm64
 
 # Update and install extra packages