remove ports, update services, remove services

This commit is contained in:
c0mmando 2024-01-29 23:05:59 +00:00
parent 4fcb6901df
commit e4d6f86faa

View File

@ -9,7 +9,6 @@ networks:
ots: ots:
element: element:
chat: chat:
cinny:
lemmy: lemmy:
bookstack: bookstack:
tor: tor:
@ -52,8 +51,6 @@ services:
- POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
volumes: volumes:
- ./schemas:/var/lib/postgresql/data:Z - ./schemas:/var/lib/postgresql/data:Z
ports:
- 127.0.0.1:5432:5432
networks: networks:
- matrix - matrix
read_only: true read_only: true
@ -96,7 +93,6 @@ services:
- element - element
- chat - chat
- lemmy - lemmy
- cinny
- bookstack - bookstack
- tor - tor
- write - write
@ -116,8 +112,6 @@ services:
- synapse - synapse
networks: networks:
- matrix - matrix
ports:
- 8008:8008
read_only: true read_only: true
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
@ -162,8 +156,6 @@ services:
"--config-path=/data/config.yaml", "--config-path=/data/config.yaml",
"serve" "serve"
] ]
ports:
- 127.0.0.1:5000:5000
volumes: volumes:
- ./matrix-registration_data:/data:Z - ./matrix-registration_data:/data:Z
networks: networks:
@ -194,8 +186,6 @@ services:
networks: networks:
- matrix - matrix
- dimension - dimension
ports:
- 127.0.0.1:8184:8184
read_only: true read_only: true
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
@ -216,8 +206,6 @@ services:
- POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C - POSTGRES_INITDB_ARGS=--encoding=UTF-8 --lc-collate=C --lc-ctype=C
volumes: volumes:
- ./dimension/db:/var/lib/postgresql/data:Z - ./dimension/db:/var/lib/postgresql/data:Z
ports:
- 127.0.0.1:5433:5432
networks: networks:
- dimension - dimension
read_only: true read_only: true
@ -237,8 +225,6 @@ services:
volumes: volumes:
- ./grafana-data:/var/lib/grafana:Z - ./grafana-data:/var/lib/grafana:Z
restart: unless-stopped restart: unless-stopped
ports:
- 3000:3000
networks: networks:
- matrix - matrix
@ -246,8 +232,6 @@ services:
image: docker.io/prom/prometheus image: docker.io/prom/prometheus
container_name: prometheus container_name: prometheus
restart: unless-stopped restart: unless-stopped
ports:
- 9000:9090
volumes: volumes:
- ./prometheus:/etc/prometheus:Z - ./prometheus:/etc/prometheus:Z
networks: networks:
@ -267,7 +251,6 @@ services:
- '--path.rootfs=/rootfs' - '--path.rootfs=/rootfs'
- '--path.sysfs=/host/sys' - '--path.sysfs=/host/sys'
- '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)' - '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|host|etc)($$|/)'
restart: unless-stopped
expose: expose:
- 9100 - 9100
networks: networks:
@ -280,8 +263,6 @@ services:
- '-port=9099' - '-port=9099'
- "--housekeeping_interval=30s" - "--housekeeping_interval=30s"
- "--docker_only=true" - "--docker_only=true"
ports:
- 9099:9099
volumes: volumes:
- /:/rootfs:ro - /:/rootfs:ro
- /var/run:/var/run:rw - /var/run:/var/run:rw
@ -298,8 +279,6 @@ services:
- DATA_SOURCE_URI=postgres:5432/synapse?sslmode=disable - DATA_SOURCE_URI=postgres:5432/synapse?sslmode=disable
- DATA_SOURCE_USER=${POSTGRES_USER} - DATA_SOURCE_USER=${POSTGRES_USER}
- DATA_SOURCE_PASS=${POSTGRES_PASSWORD} - DATA_SOURCE_PASS=${POSTGRES_PASSWORD}
ports:
- "9187:9187"
networks: networks:
- matrix - matrix
depends_on: depends_on:
@ -309,8 +288,6 @@ services:
image: nginx/nginx-prometheus-exporter:0.10.0 image: nginx/nginx-prometheus-exporter:0.10.0
container_name: nginx-exporter container_name: nginx-exporter
restart: unless-stopped restart: unless-stopped
ports:
- "4040:4040"
networks: networks:
- matrix - matrix
depends_on: depends_on:
@ -320,7 +297,7 @@ services:
- http://swag:81/nginx_status - http://swag:81/nginx_status
gitea: gitea:
image: gitea/gitea image: gitea/gitea:1.21.1
container_name: gitea container_name: gitea
environment: environment:
- USER_UID=1000 - USER_UID=1000
@ -338,8 +315,6 @@ services:
- ./gitea:/data - ./gitea:/data
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
ports:
- "3333:3333"
depends_on: depends_on:
- gitea-postgres - gitea-postgres
@ -398,15 +373,6 @@ services:
networks: networks:
- chat - chat
cinny:
image: ghcr.io/cinnyapp/cinny
container_name: cinny
restart: unless-stopped
volumes:
- ./cinny-data/config.json:/app/config.json:ro
networks:
- cinny
lemmy-postgres: lemmy-postgres:
image: postgres:15-alpine image: postgres:15-alpine
user: "70:70" user: "70:70"
@ -425,7 +391,7 @@ services:
- "com.centurylinklabs.watchtower.enable=false" - "com.centurylinklabs.watchtower.enable=false"
lemmy: lemmy:
image: dessalines/lemmy:0.18.0 image: dessalines/lemmy:0.19.2
container_name: lemmy container_name: lemmy
restart: unless-stopped restart: unless-stopped
environment: environment:
@ -439,7 +405,7 @@ services:
- lemmy - lemmy
lemmy-ui: lemmy-ui:
image: dessalines/lemmy-ui:0.18.0 image: dessalines/lemmy-ui:0.19.2
container_name: lemmy-ui container_name: lemmy-ui
restart: unless-stopped restart: unless-stopped
environment: environment:
@ -456,8 +422,8 @@ services:
hostname: pictrs hostname: pictrs
container_name: pictrs container_name: pictrs
ports: ports:
- "8537:8080" - "127.0.0.1:8537:8080"
- "6670:6669" - "127.0.0.1:6670:6669"
user: 991:991 user: 991:991
volumes: volumes:
- ./lemmy/volumes/pictrs:/mnt - ./lemmy/volumes/pictrs:/mnt
@ -471,7 +437,7 @@ services:
image: shenxn/protonmail-bridge image: shenxn/protonmail-bridge
container_name: protonmail-bridge container_name: protonmail-bridge
ports: ports:
- "1025:25" - "127.0.0.1:1025:25"
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./protonmail:/root - ./protonmail:/root
@ -546,11 +512,8 @@ services:
volumes: volumes:
- ./tor-data:/var/lib/tor - ./tor-data:/var/lib/tor
- ./tor-data/torrc:/etc/tor - ./tor-data/torrc:/etc/tor
ports:
- 127.0.0.1:9050:9050
networks: networks:
- tor - tor
- matrix
writefreely: writefreely:
image: algernon/writefreely image: algernon/writefreely
@ -558,8 +521,6 @@ services:
user: "5000:5000" user: "5000:5000"
volumes: volumes:
- ./writefreely:/data:Z - ./writefreely:/data:Z
ports:
- 9999:9999
networks: networks:
- write - write
- tor - tor