diff --git a/.gitignore b/.gitignore index 247a13c..01e9f2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ logseq/ config/ +session/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile.logseq similarity index 98% rename from Dockerfile rename to Dockerfile.logseq index b58a7f2..78e224d 100644 --- a/Dockerfile +++ b/Dockerfile.logseq @@ -9,7 +9,7 @@ LABEL maintainer="slashtechno" ENV TITLE=Logseq RUN apt-get update -RUN apt-get install libatk1.0-0 libatk-bridge2.0-0 libgtk-3-dev -y +RUN apt-get install libatk1.0-0 libatk-bridge2.0-0 libgtk-3-dev python3-xdg -y RUN mkdir -p /app/logseq/ RUN curl -o /app/logseq/logseq -L "https://github.com/logseq/logseq/releases/download/0.9.20/Logseq-linux-x64-0.9.20.AppImage" RUN chmod +x /app/logseq/logseq diff --git a/Dockerfile.session b/Dockerfile.session new file mode 100644 index 0000000..e68b675 --- /dev/null +++ b/Dockerfile.session @@ -0,0 +1,25 @@ +FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntujammy + +# set version label +ARG BUILD_DATE +ARG VERSION +ARG AUDACITY_VERSION +#LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="slashtechno" + +ENV TITLE=Logseq +RUN apt-get update +RUN apt-get install libatk1.0-0 libatk-bridge2.0-0 libgtk-3-dev python3-xdg -y +RUN mkdir -p /app/logseq/ +# RUN curl -o /app/logseq/logseq -L "https://github.com/logseq/logseq/releases/download/0.9.20/Logseq-linux-x64-0.9.20.AppImage" +RUN curl -o /app/logseq/logseq -L "https://github.com/oxen-io/session-desktop/releases/download/v1.11.4/session-desktop-linux-x86_64-1.11.4.AppImage" +RUN chmod +x /app/logseq/logseq +# RUN sed -i 's|| \n yes\n \n|' /etc/xdg/openbox/rc.xml +# add local files +# Dockerfiles are relative (?) so this copies ./root to /root +COPY /root / + +# ports and volumes +EXPOSE 3001 + +VOLUME /config diff --git a/docker-compose.yml b/docker-compose.yml index 030bdc5..45080dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,32 @@ version: "2.1" services: - logseq: + # logseq: + # build: + # context: . + # dockerfile: Dockerfile.logseq + # container_name: logseq + # security_opt: + # - seccomp:unconfined #optional + # environment: + # # Recommended to set PUID and PGID to avoid permission issues. You can use `id` to get your uid and gid. + # - PUID=1000 + # - PGID=1000 + # - TZ=Etc/UTC + # # HTTP authentification username and password + # # It seems the container user will be "abc" even if custom user is set. + # - CUSTOM_USER=abc + # - PASSWORD=password + # volumes: + # - ./logseq:/config + # ports: + # - 2000:3000 + # - 2001:3001 + # restart: unless-stopped + session: build: context: . - dockerfile: Dockerfile - container_name: logseq + dockerfile: Dockerfile.session + container_name: session security_opt: - seccomp:unconfined #optional environment: @@ -17,8 +39,8 @@ services: - CUSTOM_USER=abc - PASSWORD=password volumes: - - ./logseq:/config + - ./session:/config ports: - - 2000:3000 - - 2001:3001 + - 3000:3000 + - 3001:3001 restart: unless-stopped