Compare commits

..

7 Commits

Author SHA1 Message Date
ace326c0ba Updated docker-compose files 2025-07-27 10:30:08 +02:00
493d5dde42 updated docker compose files 2024-11-05 13:48:34 +01:00
72d4b93fdf updated nextcloud 2024-11-04 11:44:40 +01:00
39f4231c09 gitea update 2024-11-04 10:42:13 +01:00
f5270aa908 port 2024-11-04 10:33:06 +01:00
8531665064 changed back to old port 2024-11-04 10:30:25 +01:00
d44bd646b8 updated gitea to latest version 2024-11-04 10:28:06 +01:00
12 changed files with 86 additions and 27 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
/pihole/etc-pihole

View File

@@ -1,13 +1,13 @@
version: '2.2' version: '2.2'
volumes: volumes:
fhem_opt: fhem_opt:
services: services:
fhem: fhem:
image: fhem/fhem:latest image: fhem/fhem:latest
container_name: fhem container_name: fhem
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- fhem_opt:/opt/fhem/ - fhem_opt:/opt/fhem/
environment: environment:
@@ -21,4 +21,4 @@ services:
- "traefik.http.middlewares.fhem-auth.basicauth.users=nils:$$apr1$$JDBG7p8k$$LB8y6/aKcNQ/ybLz7LXjY." - "traefik.http.middlewares.fhem-auth.basicauth.users=nils:$$apr1$$JDBG7p8k$$LB8y6/aKcNQ/ybLz7LXjY."
- "traefik.http.services.fhem-service.loadbalancer.server.port=8083" - "traefik.http.services.fhem-service.loadbalancer.server.port=8083"

View File

@@ -6,7 +6,7 @@ networks:
services: services:
server: server:
image: gitea/gitea:1.21.4 image: gitea/gitea:1.22.3
container_name: gitea container_name: gitea
environment: environment:
- USER_UID=1000 - USER_UID=1000

View File

@@ -1,8 +1,8 @@
version: '2' version: '2'
services: services:
mosquitto: mosquitto:
image: eclipse-mosquitto image: eclipse-mosquitto:2.0
expose: expose:
- "1884" - "1884"
- "9001" - "9001"
@@ -11,10 +11,10 @@ services:
- "9001:9001" - "9001:9001"
volumes: volumes:
- ./mosquitto.conf:/mosquitto/config/mosquitto.conf - ./mosquitto.conf:/mosquitto/config/mosquitto.conf
- mosquitto_data:/mosquitto/data - mosquitto_data:/mosquitto/data
- mosquitto_log:/mosquitto/log - mosquitto_log:/mosquitto/log
restart: unless-stopped restart: unless-stopped
volumes: volumes:
mosquitto_data: mosquitto_data:

View File

@@ -21,7 +21,7 @@ services:
app: app:
image: nextcloud:27.1.6 image: nextcloud:30.0.1
container_name: nextcloud container_name: nextcloud
restart: always restart: always
ports: ports:

View File

@@ -1,6 +1,6 @@
services: services:
nginx: nginx:
image: nginx:1.25 image: nginx:1.27
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.nginx.rule=Host(`montana2000.freeddns.org`)" - "traefik.http.routers.nginx.rule=Host(`montana2000.freeddns.org`)"
@@ -11,10 +11,10 @@ services:
volumes: volumes:
- www-data:/usr/share/nginx/html/ - www-data:/usr/share/nginx/html/
restart: always restart: always
volumes: volumes:
www-data: www-data:
networks: networks:
traefik_web: traefik_web:

View File

@@ -2,7 +2,7 @@ version: '2.4'
services: services:
octoprint: octoprint:
image: octoprint/octoprint image: octoprint/octoprint:latest
restart: unless-stopped restart: unless-stopped
ports: ports:
- 8088:80 - 8088:80
@@ -16,7 +16,7 @@ services:
# you add a video device # you add a video device
#environment: #environment:
# - ENABLE_MJPG_STREAMER=true # - ENABLE_MJPG_STREAMER=true
#### ####
# uncomment if you wish to edit the configuration files of octoprint # uncomment if you wish to edit the configuration files of octoprint
# refer to docs on configuration editing for more information # refer to docs on configuration editing for more information
@@ -37,4 +37,4 @@ services:
# - octoprint:/octoprint # - octoprint:/octoprint
volumes: volumes:
octoprint: octoprint:

24
pihole/docker-compose.yml Normal file
View File

@@ -0,0 +1,24 @@
# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
services:
pihole:
container_name: pihole
hostname: Pihole
image: pihole/pihole:latest
network_mode: vlanPihole
environment:
# Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
TZ: 'Europe/Berlin'
# Set a password to access the web interface. Not setting one will result in a random password being assigned
FTLCONF_webserver_api_password: 'inginf95'
WEB_PORT: '9090'
# Volumes store your data between container upgrades
volumes:
# For persisting Pi-hole's databases and common configuration file
- './etc-pihole:/etc/pihole'
# Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards
#- './etc-dnsmasq.d:/etc/dnsmasq.d'
#cap_add:
# See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
# Required if you are using Pi-hole as your DHCP server, else not needed
#- NET_ADMIN
restart: unless-stopped

View File

@@ -0,0 +1,37 @@
# More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
services:
pihole:
container_name: pihole
image: pihole/pihole:latest
ports:
# DNS Ports
- "53:53/tcp"
- "53:53/udp"
# Default HTTP Port
- "9090:80/tcp"
# Default HTTPs Port. FTL will generate a self-signed certificate
#- "9043:443/tcp"
# Uncomment the below if using Pi-hole as your DHCP Server
#- "67:67/udp"
networks:
- pihole_network
environment:
# Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
TZ: 'Europe/Berlin'
# Set a password to access the web interface. Not setting one will result in a random password being assigned
FTLCONF_webserver_api_password: 'inginf95'
# Volumes store your data between container upgrades
volumes:
# For persisting Pi-hole's databases and common configuration file
- './etc-pihole:/etc/pihole'
# Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards
#- './etc-dnsmasq.d:/etc/dnsmasq.d'
#cap_add:
# See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
# Required if you are using Pi-hole as your DHCP server, else not needed
#- NET_ADMIN
restart: unless-stopped
networks:
pihole_network:
driver: bridge

View File

@@ -14,6 +14,8 @@ services:
- /media/plex/tv-shows:/tv-shows - /media/plex/tv-shows:/tv-shows
- /media/plex/movies:/movies - /media/plex/movies:/movies
- /media/plex/music:/music - /media/plex/music:/music
- /media/plex/cartoons:/cartoons
- /media/plex/comedy:/comedy
restart: unless-stopped restart: unless-stopped
ports: ports:
# Plex DLNA Server # Plex DLNA Server
@@ -29,13 +31,8 @@ services:
- "traefik.http.routers.plex.service=plex" - "traefik.http.routers.plex.service=plex"
- "traefik.http.services.plex.loadbalancer.server.port=32400" - "traefik.http.services.plex.loadbalancer.server.port=32400"
- "traefik.docker.network=proxy" - "traefik.docker.network=proxy"
networks: network_mode: host
- traefik_web
volumes: volumes:
plex_config: plex_config:
networks:
traefik_web:
external: true

View File

@@ -2,7 +2,7 @@ version: '3.0'
services: services:
mytb: mytb:
restart: unless-stopped restart: unless-stopped
image: "thingsboard/tb-postgres" image: "thingsboard/tb-postgres:latest"
ports: ports:
- "9090:9090" - "9090:9090"
- "1883:1883" - "1883:1883"
@@ -15,5 +15,5 @@ services:
- things_board_log:/var/log/thingsboard - things_board_log:/var/log/thingsboard
volumes: volumes:
things_board_data: things_board_data:
things_board_log: things_board_log:

View File

@@ -3,7 +3,7 @@ version: "3.3"
services: services:
traefik: traefik:
image: "traefik:v2.10" image: "traefik:v3.2"
container_name: "traefik" container_name: "traefik"
command: command:
#- "--log.level=DEBUG" #- "--log.level=DEBUG"