ARM64 Suppport + Bump Obsidian to 1.0.3 (sytone#25)

* arm64 support & bump obisidian to 1.0.3 * fix typo * fixed tags * fixing arm64 appimage * Update dockerfile.arm64 * Update dockerfile.arm64 * Update and rename justsky.yml to docker.yml * added build cache Thanks to @just5ky and @Hoempi
sirex99 · Nov 21, 2022 · 5431ad7 · 5431ad7
1 parent 6785ea5
commit 5431ad7
Show file tree

Hide file tree

Showing 4 changed files with 179 additions and 0 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,8 @@ updates:
     directory: '/' # Location of package manifests
     schedule:
       interval: 'daily'
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+        interval: "daily"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,76 @@
+name: Docker
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - latest
+      - main
+    paths-ignore:
+      - 'README.MD'
+      - '.github'
+
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+#      - name: Log in to the Container registry
+#        uses: docker/login-action@v2
+#        with:
+#          registry: ghcr.io
+#          username: ${{ github.actor }}
+#          password: ${{ secrets.GIT_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/obsidian-remote
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: dockerfile.amd64
+          platforms: linux/amd64
+          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@v3
+        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.amd64 b/dockerfile.amd64
@@ -0,0 +1,49 @@
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal
+RUN \
+    echo "**** install packages ****" && \
+        # Update and install extra packages.
+        apt-get update && \
+        apt-get install -y --no-install-recommends \
+            # Packages needed to download and extract obsidian.
+            curl \
+            libnss3 \
+            # Install Chrome dependencies.
+            dbus-x11 \
+            uuid-runtime && \
+    echo "**** cleanup ****" && \
+        apt-get autoclean && \
+        rm -rf \
+        /var/lib/apt/lists/* \
+        /var/tmp/* \
+        /tmp/*
+
+# set version label
+ARG OBSIDIAN_VERSION=1.0.3
+
+RUN \
+    echo "**** download obsidian ****" && \
+        curl \
+        https://github.com/obsidianmd/obsidian-releases/releases/download/v$OBSIDIAN_VERSION/Obsidian-$OBSIDIAN_VERSION.AppImage \
+        -L \
+        -o obsidian.AppImage
+
+RUN \
+    echo "**** extract obsidian ****" && \
+        chmod +x /obsidian.AppImage && \
+        /obsidian.AppImage --appimage-extract
+
+ENV \
+    CUSTOM_PORT="8080" \
+    GUIAUTOSTART="true" \
+    HOME="/vaults" \
+    TITLE="Obsidian v$OBSIDIAN_VERSION"
+
+# add local files
+COPY root/ /
+
+EXPOSE 8080
+EXPOSE 27123
+EXPOSE 27124
+VOLUME ["/config","/vaults"]
+
+
diff --git a/dockerfile.arm64 b/dockerfile.arm64
@@ -0,0 +1,49 @@
+FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal
+RUN \
+    echo "**** install packages ****" && \
+        # Update and install extra packages.
+        apt-get update && \
+        apt-get install -y --no-install-recommends \
+            # Packages needed to download and extract obsidian.
+            curl \
+            libnss3 \
+            zlib1g-dev \
+            # Install Chrome dependencies.
+            dbus-x11 \
+            uuid-runtime && \
+    echo "**** cleanup ****" && \
+        apt-get autoclean && \
+        rm -rf \
+        /var/lib/apt/lists/* \
+        /var/tmp/* \
+        /tmp/*
+
+# set version label
+ARG OBSIDIAN_VERSION=1.0.3
+ARG ARCH=arm64
+
+RUN \
+    echo "**** download obsidian ****" && \
+        curl \
+        https://github.com/obsidianmd/obsidian-releases/releases/download/v$OBSIDIAN_VERSION/Obsidian-1.0.3-arm64.AppImage  -o obsidian.AppImage
+
+RUN \
+    echo "**** extract obsidian ****" && \
+        chmod +x /obsidian.AppImage && \
+        /obsidian.AppImage --appimage-extract
+
+ENV \
+    CUSTOM_PORT="8080" \
+    GUIAUTOSTART="true" \
+    HOME="/vaults" \
+    TITLE="Obsidian v$OBSIDIAN_VERSION"
+
+# add local files
+COPY root/ /
+
+EXPOSE 8080
+EXPOSE 27123
+EXPOSE 27124
+VOLUME ["/config","/vaults"]
+
+