From 25382829f0827ed0d68993e8b414958bc2829165 Mon Sep 17 00:00:00 2001 From: Linux User Date: Sat, 15 Jan 2022 13:20:51 +0100 Subject: [PATCH] Updates --- compose.sh | 0 composes/docker-compose.home.yml | 58 ++++++++++++++++++++++++++++ composes/docker-compose.media.yml | 35 +++++++++++++++++ composes/docker-compose.traefik.yml | 5 ++- configEditor/ConfigEditor.Dockerfile | 16 ++++++++ configEditor/docker-compose.yml | 17 ++++++++ docker-compose.yml | 7 +++- 7 files changed, 135 insertions(+), 3 deletions(-) mode change 100755 => 100644 compose.sh create mode 100644 configEditor/ConfigEditor.Dockerfile create mode 100644 configEditor/docker-compose.yml diff --git a/compose.sh b/compose.sh old mode 100755 new mode 100644 diff --git a/composes/docker-compose.home.yml b/composes/docker-compose.home.yml index a84cfb1..173eeb8 100644 --- a/composes/docker-compose.home.yml +++ b/composes/docker-compose.home.yml @@ -108,3 +108,61 @@ services: aliases: - nginxshared + sharedsamba: + image: dperson/samba + environment: + TZ: 'EST5EDT' + container_name: sharedsamba + read_only: true + tmpfs: + - /tmp + restart: unless-stopped + stdin_open: true + tty: true + volumes: + - /mnt/Data/Shared/Vendeg:/mnt/shared + command: '-u "user;VendegJelszo123;1000" -s "Shared;/mnt/shared;yes;no;no;user"' + networks: + homenet: + aliases: + - sharedsamba + + sharedfilestash: + container_name: sharedfilestash + image: machines/filestash + ports: + - "9901:9901" + - "10000:8080" + restart: always + environment: + - APPLICATION_URL=sharedup.kovijoe.com + volumes: + - "/mnt/Data/.system/containerdata/sharedfilestash/data/:/app/data/state" + labels: + - "traefik.enable=true" + - "traefik.http.routers.sharedfilestash-secure.rule=Host(`sharedup.kovijoe.com`)" + - "traefik.http.routers.sharedfilestash-secure.entrypoints=https" + - "traefik.http.routers.sharedfilestash-secure.tls.certresolver=letsencrypt" + - "traefik.http.routers.sharedfilestash-secure.middlewares=xfwdprotohttps@file" + #- "traefik.http.services.sharedfilestash.loadbalancer.passhostheader=true" + - "traefik.http.services.sharedfilestash.loadbalancer.server.port=8334" + networks: + homenet: + aliases: + - sharedfilestash + + sharedsshfs: + container_name: sharedsshfs + image: atmoz/sftp + restart: always + privileged: true + ports: + - "2222:22" + volumes: + - "/mnt/Data/.system/containerdata/sharedsshfs/config/users.conf:/etc/sftp/users.conf:ro" + - "/mnt/Data/.system/containerdata/sharedsshfs/init-scripts:/etc/sftp.d/" + - /mnt/Data/Shared/Vendeg:/mnt/shared + networks: + homenet: + aliases: + - sharedsshfs diff --git a/composes/docker-compose.media.yml b/composes/docker-compose.media.yml index b1cfe2a..c45ec66 100644 --- a/composes/docker-compose.media.yml +++ b/composes/docker-compose.media.yml @@ -127,3 +127,38 @@ services: homenet: aliases: - jellyfin + +# shinobi: +# image: shinobisystems/shinobi:dev +# container_name: shinobi +# ports: +# - 8080:8080 +# volumes: +# - "/dev/shm/Shinobi/streams:/dev/shm/streams" +# - "/etc/localtime:/etc/localtime:ro" +# - "/mnt/Data/.system/containerdata/shinobi/config:/config:rw" +# - "/mnt/Data/.system/containerdata/shinobi/customAutoLoad:/home/Shinobi/libs/customAutoLoad:rw" +# - "/mnt/Data/.system/containerdata/shinobi/database:/var/lib/mysql:rw" +# - "/mnt/Data/.system/containerdata/shinobi/videos:/home/Shinobi/videos:rw" +# - "/mnt/Data/.system/containerdata/shinobi/plugins:/home/Shinobi/plugins:rw" +# labels: +# - "traefik.enable=true" +# - "traefik.http.routers.shinobi.rule=Host(`shinobi.kovijoe.com`)" +# - "traefik.http.routers.shinobi.entrypoints=https" +# - "traefik.http.routers.shinobi.tls.certresolver=letsencrypt" + + plex: + image: lscr.io/linuxserver/plex + container_name: plex + network_mode: host + environment: + - PUID=1000 + - PGID=1000 + - VERSION=docker + - PLEX_CLAIM= #optional + volumes: + - /mnt/Data/.system/containerdata/plex/config:/config + - /mnt/Data/.system/containerdata/plex/transcode:/transcode + - "Movies:/media/Movies" + - "TvShows:/media/TvShows" + restart: unless-stopped \ No newline at end of file diff --git a/composes/docker-compose.traefik.yml b/composes/docker-compose.traefik.yml index 6fe2ed3..485b9f5 100644 --- a/composes/docker-compose.traefik.yml +++ b/composes/docker-compose.traefik.yml @@ -1,8 +1,9 @@ version: "3" services: traefik: - image: "traefik:v2.3" + image: "traefik:v2.4" container_name: "traefik" + restart: unless-stopped command: #- "--log.level=DEBUG" #- "--certificatesresolvers.letsencrypt.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory" @@ -27,4 +28,4 @@ services: - "/mnt/Data/.system/containerdata/traefik/letsencrypt:/letsencrypt" - "/mnt/Data/.system/containerdata/traefik/dynamic:/etc/traefik/dynamic" networks: - - homenet \ No newline at end of file + - homenet diff --git a/configEditor/ConfigEditor.Dockerfile b/configEditor/ConfigEditor.Dockerfile new file mode 100644 index 0000000..041db47 --- /dev/null +++ b/configEditor/ConfigEditor.Dockerfile @@ -0,0 +1,16 @@ +FROM ubuntu:20.04 + +RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y openssh-server git +RUN mkdir /var/run/sshd +RUN echo 'root:$1$jgBLBi/m$3Dk1spVwbXoeZxW4nmoU6.' | chpasswd -e +RUN sed -i 's/#*PermitRootLogin prohibit-password/PermitRootLogin yes/g' /etc/ssh/sshd_config + +# SSH login fix. Otherwise user is kicked off after login +RUN sed -i 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' /etc/pam.d/sshd + +# ENV NOTVISIBLE "in users profile" +# RUN echo "export VISIBLE=now" >> /etc/profile + +EXPOSE 22 +CMD ["/usr/sbin/sshd", "-D"] + diff --git a/configEditor/docker-compose.yml b/configEditor/docker-compose.yml new file mode 100644 index 0000000..7e08681 --- /dev/null +++ b/configEditor/docker-compose.yml @@ -0,0 +1,17 @@ +version: "3" +services: + ssheditor: + # image: adix/ssheditor + build: + dockerfile: ConfigEditor.Dockerfile + context: . + container_name: configeditor + restart: unless-stopped + volumes: + - /var/run/docker.sock:/var/run/docker.sock +# - "/home/adam/containerconfig:/containerconfig" +# - "/home/adam/dockerconfig:/dockerconfig" + - "/mnt/Data/.system/:/docker" + ports: + - "2202:22" + diff --git a/docker-compose.yml b/docker-compose.yml index fe849ff..8880725 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,20 +31,25 @@ volumes: driver_opts: device: /mnt/Data/Downloads/Complete o: bind + type: none DownloadsIncomplete: driver: local driver_opts: device: /mnt/Data/Downloads/Incomplete o: bind + type: none Movies: driver: local driver_opts: device: /mnt/Data/Videos/Filmek o: bind + type: none + TvShows: driver: local driver_opts: device: /mnt/Data/Videos/Sorozatok - o: bind \ No newline at end of file + o: bind + type: none \ No newline at end of file