Skip to content

Commit

Permalink
fixes for performance, emoji support and updated obsidian version (sy…
Browse files Browse the repository at this point in the history
  • Loading branch information
alangrafu committed Jun 18, 2023
1 parent 2abe83a commit 4f75496
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 80 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ LABEL maintainer="github@sytone.com" \
# 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 install -y --no-install-recommends curl libgtk-3-0 libnotify4 libatspi2.0-0 libsecret-1-0 libnss3 desktop-file-utils fonts-noto-color-emoji && \
apt-get autoclean && rm -rf /var/lib/apt/lists/* /var/tmp/* /tmp/*

# Set version label
ARG OBSIDIAN_VERSION=1.2.8
ARG OBSIDIAN_VERSION=1.3.5

# Download and install Obsidian
RUN echo "**** download obsidian ****" && \
Expand All @@ -31,7 +31,6 @@ ENV CUSTOM_PORT="8080" \

# Add local files
COPY root/ /

EXPOSE 8080 8443
VOLUME ["/config","/vaults"]

Expand Down
66 changes: 33 additions & 33 deletions dockerfile.amd64
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
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.2.8
# 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
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
86 changes: 43 additions & 43 deletions dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal-20210824
ARG OBSIDIAN_VERSION=1.2.8
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
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal-20210824

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
2 changes: 1 addition & 1 deletion root/defaults/autostart
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sudo /usr/bin/obsidian --no-sandbox
sudo /usr/bin/obsidian --no-sandbox --no-xshm --disable-dev-shm-usage --disable-gpu --disable-software-rasterizer

0 comments on commit 4f75496

Please sign in to comment.