From 5202c8a23e3b95bf7679a232cb232e65c4fdc1ea Mon Sep 17 00:00:00 2001 From: Drdada Date: Sat, 21 Oct 2023 10:59:56 +0000 Subject: [PATCH] Cleanup file and envfile example --- .env.example | 18 ++++++++++++++++-- .gitignore | 2 ++ dockerfile.amd64 | 33 --------------------------------- dockerfile.arm64 | 44 -------------------------------------------- 4 files changed, 18 insertions(+), 79 deletions(-) create mode 100644 .gitignore delete mode 100644 dockerfile.amd64 delete mode 100644 dockerfile.arm64 diff --git a/.env.example b/.env.example index 0accb8e..3ec0460 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,7 @@ -#Set your Nextcloud credentials and informations -#Please fill all the variables +#Set your credentials and informations (if needed) +# NEXTCLOUD +# Please fill all the variables # Nextcloud Username NC_USER= # Nextcloud Password @@ -9,3 +10,16 @@ NC_PASS= NC_HOST= # Folder path on your Nextcloud personal space e.g: /Obsidian NC_PATH= + +# Set credentials (mandatory if exposed on internet) +CUSTOM_USER= +PASSWORD= + +# Timezone used +TZ=Europe/Paris + +# If you use nginx-proxy +VIRTUAL_HOST= +VIRTUAL_PORT=8080 +LETSENCRYPT_HOST= + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1c79342 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.env +.env.local diff --git a/dockerfile.amd64 b/dockerfile.amd64 deleted file mode 100644 index d34062c..0000000 --- a/dockerfile.amd64 +++ /dev/null @@ -1,33 +0,0 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbullseye - -# 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 && \ - apt-get autoclean && rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* - -# Set version label -ARG OBSIDIAN_VERSION=1.3.5 - -# Download and install Obsidian -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 - -# Environment variables -ENV CUSTOM_PORT="8080" \ - CUSTOM_HTTPS_PORT="8443" \ - CUSTOM_USER="" \ - PASSWORD="" \ - SUBFOLDER="" \ - TITLE="Obsidian v${OBSIDIAN_VERSION}" \ - FM_HOME="/vaults" - -# Add local files -COPY root/ / - -EXPOSE 8080 8443 -VOLUME ["/config","/vaults"] - -# Define a healthcheck -HEALTHCHECK CMD curl --fail http://localhost:8080/ || exit 1 diff --git a/dockerfile.arm64 b/dockerfile.arm64 deleted file mode 100644 index 4bfd8ab..0000000 --- a/dockerfile.arm64 +++ /dev/null @@ -1,44 +0,0 @@ -# FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal-20210824 -FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbullseye - -ARG OBSIDIAN_VERSION=1.3.5 -ARG ARCH=arm64 - -# Update and install extra packages. -RUN echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - git \ - curl \ - libnss3 \ - zlib1g-dev \ - dbus-x11 \ - uuid-runtime && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/* - -# Download and install Obsidian -RUN echo "**** download obsidian ****" && \ - curl -L -o /obsidian.AppImage \ - "https://github.com/obsidianmd/obsidian-releases/releases/download/v${OBSIDIAN_VERSION}/Obsidian-${OBSIDIAN_VERSION}-${ARCH}.AppImage" && \ - chmod +x /obsidian.AppImage && \ - /obsidian.AppImage --appimage-extract - -# Environment variables -ENV CUSTOM_PORT="8080" \ - CUSTOM_HTTPS_PORT="8443" \ - CUSTOM_USER="" \ - PASSWORD="" \ - SUBFOLDER="" \ - TITLE="Obsidian v$OBSIDIAN_VERSION" \ - FM_HOME="/vaults" - -# Add local files -COPY root/ / - -# Expose ports and volumes -EXPOSE 8080 27123 27124 -VOLUME ["/config","/vaults"] - -# Define a healthcheck -HEALTHCHECK CMD curl --fail http://localhost:8080/ || exit 1