Merge branch 'dev'

Reviewed-on: #2

immich/.env

@@ -0,0 +1,20 @@
+# You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables
+
+# The location where your uploaded files are stored
+UPLOAD_LOCATION=/mnt/storage/appdata/immich/library
+# The location where your database files are stored
+DB_DATA_LOCATION=/mnt/storage/appdata/immich/postgres
+
+# To set a timezone, uncomment the next line and change Etc/UTC to a TZ identifier from this list: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
+TZ=America/New_York
+
+# The Immich version to use. You can pin this to a specific version like "v1.71.0"
+IMMICH_VERSION=v2.3.1
+
+# Connection secret for postgres. You should change it to a random password
+DB_PASSWORD=postgres
+
+# The values below this line do not need to be changed
+###################################################################################
+DB_USERNAME=postgres
+DB_DATABASE_NAME=immich

immich/compose.yaml

@@ -1,10 +1,11 @@
 #
-# WARNING: Make sure to use the docker-compose.yml of the current release:
+# WARNING: To install Immich, follow our guide: https://immich.app/docs/install/docker-compose
+#
+# Make sure to use the docker-compose.yml of the current release:
 #
 # https://github.com/immich-app/immich/releases/latest/download/docker-compose.yml
 #
 # The compose file on main may not be compatible with the latest release.
-#
 
 name: immich
 
@@ -16,54 +17,57 @@ services:
     #   file: hwaccel.transcoding.yml
     #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     volumes:
-      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
+      - ${UPLOAD_LOCATION}:/data
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
     ports:
-      - 2283:2283
+      - '2283:2283'
     depends_on:
       - redis
       - database
     restart: always
+    healthcheck:
+      disable: false
 
   immich-machine-learning:
     container_name: immich_machine_learning
-    # For hardware acceleration, add one of -[armnn, cuda, openvino] to the image tag.
+    # For hardware acceleration, add one of -[armnn, cuda, rocm, openvino, rknn] to the image tag.
     # Example tag: ${IMMICH_VERSION:-release}-cuda
     image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
     # extends: # uncomment this section for hardware acceleration - see https://immich.app/docs/features/ml-hardware-acceleration
     #   file: hwaccel.ml.yml
-    #   service: cpu # set to one of [armnn, cuda, openvino, openvino-wsl] for accelerated inference - use the `-wsl` version for WSL2 where applicable
+    #   service: cpu # set to one of [armnn, cuda, rocm, openvino, openvino-wsl, rknn] for accelerated inference - use the `-wsl` version for WSL2 where applicable
     volumes:
       - model-cache:/cache
     env_file:
       - .env
     restart: always
+    healthcheck:
+      disable: false
 
   redis:
     container_name: immich_redis
-    image: docker.io/redis:6.2-alpine@sha256:d6c2911ac51b289db208767581a5d154544f2b2fe4914ea5056443f62dc6e900
+    image: docker.io/valkey/valkey:8-bookworm@sha256:fea8b3e67b15729d4bb70589eb03367bab9ad1ee89c876f54327fc7c6e618571
     healthcheck:
       test: redis-cli ping || exit 1
     restart: always
 
   database:
     container_name: immich_postgres
-    image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
+    image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:8d292bdb796aa58bbbaa47fe971c8516f6f57d6a47e7172e62754feb6ed4e7b0
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_DB: ${DB_DATABASE_NAME}
       POSTGRES_INITDB_ARGS: '--data-checksums'
+      # Uncomment the DB_STORAGE_TYPE: 'HDD' var if your database isn't stored on SSDs
+      # DB_STORAGE_TYPE: 'HDD'
     volumes:
+      # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
       - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
-    healthcheck:
-      test: pg_isready --dbname='${DB_DATABASE_NAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
-      interval: 5m
-      start_interval: 30s
-      start_period: 5m
-    command: ["postgres", "-c" ,"shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
+    shm_size: 128mb
     restart: always
 
 volumes:

inactive/jenkins/compose.yaml

@@ -0,0 +1,11 @@
+services:
+  jenkins:
+    image: jenkins/jenkins:lts
+    ports:
+      - "9080:8080"
+    volumes:
+      - jenkins_home:/var/jenkins_home
+  ssh-agent:
+    image: jenkins/ssh-agent
+volumes:
+  jenkins_home:

jellyfin/compose.yaml

@@ -2,13 +2,16 @@ services:
   jellyfin:
     image: jellyfin/jellyfin
     container_name: jellyfin
-    user: 1000:1000
     network_mode: 'host'
     volumes:
       - /mnt/storage/appdata/jellyfin/config:/config
       - /mnt/storage/appdata/jellyfin/config/web-config.json:/jellyfin/jellyfin-web/config.json
       - /mnt/storage/appdata/jellyfin/cache:/cache
       - /mnt/cygnus:/cygnus:ro
+      - type: bind
+        source: /mnt/storage/appdata/jellyfin/media
+        target: /media
+        read_only: true
     restart: 'unless-stopped'
     # Optional - alternative address used for autodiscovery
     # environment:

makemkv/compose.yaml

@@ -0,0 +1,11 @@
+services:
+  makemkv:
+    image: jlesage/makemkv
+    ports:
+      - "5801:5800"
+    volumes:
+      - "/home/cjones/makemkv:/config:rw"
+      - "/home/cjones/makemkv/storage:/storage:ro"
+      - "/home/cjones/makemkv/output:/output:rw"
+    devices:
+      - "/dev/sr0:/dev/sr0"

matter-server/compose.yaml

@@ -0,0 +1,11 @@
+services:  
+  matter-server:  
+    container_name: matter-server  
+    image: ghcr.io/home-assistant-libs/python-matter-server:stable  
+    restart: unless-stopped  
+    security_opt:  
+      - apparmor=unconfined  
+    volumes:  
+      - ./data:/data  
+      - /run/dbus:/run/dbus:ro  
+    network_mode: host

mc/compose.yaml

@@ -15,8 +15,8 @@ services:
       - "52199:52199"
       - "1901:1900/udp"
     volumes:
-        - ./config:/config:rw
-        - ./log:/log:rw
+        - /mnt/storage/appdata/mc/config:/config:rw
+        - /mnt/storage/appdata/mc/log:/log:rw
         - /etc/localtime:/etc/localtime:ro
         - /mnt/cygnus/Music/Common:/data/music:rw
 

nextcloud/compose.yaml

@@ -1,16 +1,10 @@
-version: '3'
-
-#volumes:
-#  nextcloud:
-#  db:
-
 services:
   db:
     image: mariadb:10.6
     restart: always
     command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
     volumes:
-      - /mnt/storage/appdata/nextcloud1/mysql:/var/lib/mysql
+      - /mnt/storage/appdata/nextcloud/mysql:/var/lib/mysql
     networks:
       - default
     environment:
@@ -22,14 +16,12 @@ services:
   app:
     depends_on:
       - db
-    image: nextcloud:30
+    image: nextcloud:32
     restart: always
     ports:
       - 8080:80
- #   links:
- #     - db
     volumes:
-      - /mnt/storage/appdata/nextcloud1/www/html:/var/www/html
+      - /mnt/storage/appdata/nextcloud/www/html:/var/www/html
     networks:
       - default
     environment:

portainer/compose.yaml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   portainer:
     image: portainer/portainer:latest
@@ -12,7 +10,7 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ./data:/data
+      - /mnt/storage/appdata/portainer/data:/data
     ports:
       - 9000:9000
     labels:

scripts/deploy.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/bash
+containersdirectory="/home/cjones/workspace/containers"
+dockerdirectory="/opt/docker"
+if [ $# -eq 1 ]; then
+   sourcedirectory="$containersdirectory/$1"
+   echo Deploying $1
+   cp -R $sourcedirectory $dockerdirectory
+   echo Deployed
+   ls $dockerdirectory/$1
+else 
+   echo Incorrect argument
+fi

vaultwarden/.env

@@ -0,0 +1 @@
+VAULTWARDEN_ADMIN_TOKEN='mfLzuPlsXDqtIwTGSN/oZ3cgmFKWXY/zv+hO94gtqsJeHdl7+O+tJeMZrTzQNMfI'