Skip to content

Commit 8c24dac

Browse files
juevjuev
committed
feat: improve docker-files
1 parent efd0cf4 commit 8c24dac

28 files changed

+60
-275
lines changed

‎accessories/baikal/docker-compose.yaml

+3-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
1-
# Docker Compose file for a Baikal server
2-
3-
version: "2"
41
services:
2+
53
baikal:
64
image: ckulka/baikal:nginx
75
restart: always
8-
#ports:
9-
# - "127.0.0.1:8083:80"
6+
ports:
7+
- "127.0.0.1:8083:80"
108
volumes:
119
- config:/var/www/baikal/config
1210
- data:/var/www/baikal/Specific
1311

1412
volumes:
1513
config:
1614
data:
17-
18-
networks:
19-
default:
20-
name: caddy-network
21-
external: true

‎accessories/caddy/docker-compose.yaml

+2-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
version: "3.7"
2-
31
services:
2+
43
caddy:
54
image: juev-caddy:latest
65
build: ./
@@ -11,21 +10,7 @@ services:
1110
- caddy_config:/config
1211
labels:
1312
- "com.centurylinklabs.watchtower.enable=false"
14-
cloudflared:
15-
image: cloudflare/cloudflared:latest
16-
restart: always
17-
user: root
18-
#entrypoint: cloudflared tunnel run
19-
command: tunnel run
20-
container_name: cloudflared
21-
depends_on:
22-
- caddy
23-
volumes:
24-
- $PWD/cloudflared:/root/.cloudflared
13+
2514
volumes:
2615
caddy_data:
2716
caddy_config:
28-
networks:
29-
default:
30-
name: caddy-network
31-
external: true

‎accessories/firefly/docker-compose.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
version: '3.3'
2-
31
services:
2+
43
fireflyiii:
54
container_name: fireflyiii
65
image: jc5x/firefly-iii:latest
@@ -12,14 +11,6 @@ services:
1211
networks:
1312
- internal
1413
- web
15-
labels:
16-
- "traefik.http.routers.fireflyiii.rule=Host(`${DOMAIN}`)"
17-
- "traefik.enable=true"
18-
- "traefik.backend=fireflyiii"
19-
- "traefik.docker.network=web"
20-
- "traefik.port=80"
21-
# - "traefik.http.routers.fireflyiii.entrypoints=websecure"
22-
# - "traefik.http.routers.fireflyiii.tls.certresolver=mydnschallenge"
2314

2415
fireflyiiidb:
2516
container_name: firefluiiidb

‎accessories/irc/docker-compose.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "2.0"
2-
31
services:
42
bitlbee:
53
build: .
@@ -8,18 +6,15 @@ services:
86
restart: always
97
#ports:
108
# - 6667:6667
11-
networks:
12-
- bitlbee
139
volumes:
1410
- ./etc/bitlbee:/usr/local/etc/bitlbee
1511
- bitlbee_data:/var/lib/bitlbee
1612
labels:
1713
- "com.centurylinklabs.watchtower.enable=false"
14+
1815
znc:
1916
image: lscr.io/linuxserver/znc:latest
2017
container_name: znc
21-
networks:
22-
- bitlbee
2318
environment:
2419
- PUID=1000
2520
- PGID=1000
@@ -32,6 +27,3 @@ services:
3227

3328
volumes:
3429
bitlbee_data:
35-
36-
networks:
37-
bitlbee:

‎accessories/jellyfin/docker-compose.yaml

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version: '3.5'
21
services:
2+
33
jellyfin:
44
image: jellyfin/jellyfin
55
container_name: jellyfin
@@ -11,14 +11,3 @@ services:
1111
source: ./data/media
1212
target: /media
1313
restart: always
14-
15-
cloudflared:
16-
image: cloudflare/cloudflared:latest
17-
environment:
18-
- TUNNEL_TOKEN=token
19-
command: 'tunnel run'
20-
restart: always
21-
read_only: true
22-
user: root
23-
depends_on:
24-
- jellyfin

‎accessories/mtg/docker-compose.yml

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
1-
version: '3'
21
services:
2+
33
mtg:
44
image: 'nineseconds/mtg:stable'
55
restart: always
6-
# ports:
7-
# - "443:443"
6+
ports:
7+
- "443:443"
88
volumes:
99
- /etc/timezone:/etc/timezone:ro
1010
# - /etc/localtime:/etc/localtime:ro
1111
command: simple-run 0.0.0.0:443 $SECRET
12-
13-
cloudflared:
14-
image: cloudflare/cloudflared:latest
15-
environment:
16-
- TUNNEL_TOKEN
17-
command: 'tunnel run'
18-
restart: always
19-
read_only: true
20-
user: root
21-
depends_on:
22-
- mtg

‎accessories/nextcloud/docker-compose.yml

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
services:
2+
23
nextcloud-aio-mastercontainer:
34
image: nextcloud/all-in-one:latest
45
init: true
@@ -38,19 +39,6 @@ services:
3839
# # Uncomment the following line when using SELinux
3940
# security_opt: ["label:disable"]
4041

41-
cloudflared:
42-
image: cloudflare/cloudflared:latest
43-
environment:
44-
- TUNNEL_TOKEN=token
45-
command: 'tunnel run'
46-
restart: always
47-
read_only: true
48-
user: root
49-
depends_on:
50-
- nextcloud-aio-mastercontainer
51-
volumes:
52-
- /var/run/docker.sock:/var/run/docker.sock:ro
53-
5442
# # Optional: Caddy reverse proxy. See https://github.com/nextcloud/all-in-one/blob/main/reverse-proxy.md
5543
# # You can find further examples here: https://github.com/nextcloud/all-in-one/discussions/588
5644
# caddy:

‎accessories/pi-hole/docker-compose.yml

+2-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
---
2-
version: "3"
31
services:
2+
43
pihole:
54
container_name: pihole
65
domainname: "${DOMAIN}"
@@ -31,18 +30,6 @@ services:
3130
cap_add:
3231
- NET_ADMIN
3332
restart: unless-stopped
34-
networks:
35-
- web
36-
labels:
37-
- "traefik.http.routers.pihole.rule=Host(`${DOMAIN}`)"
38-
- "traefik.enable=true"
39-
- "traefik.backend=pihole"
40-
- "traefik.docker.network=web"
41-
# - "traefik.http.routers.pihole.entrypoints=websecure"
42-
# - "traefik.http.routers.pihole.tls.certresolver=mydnschallenge"
43-
- "traefik.http.services.pihole.loadbalancer.server.port=80"
44-
networks:
45-
web:
46-
external: true
33+
4734
volumes:
4835
etc:

‎accessories/traefik/docker-compose.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
version: '3'
2-
31
services:
2+
43
app:
54
image: "traefik:v2.4"
65
restart: always
@@ -49,6 +48,7 @@ services:
4948
- "traefik.http.routers.traefik.tls.domains[0].main=juev.org"
5049
- "traefik.http.routers.traefik.tls.domains[0].sans=*.juev.org"
5150
- "traefik.http.routers.traefik.tls.certresolver=mydnschallenge"
51+
5252
networks:
5353
web:
5454
external: true

‎accessories/webdav/.env-example

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
AUTH_TYPE=Digest
22
USERNAME=secretusername
33
PASSWORD=versysecretpassword
4-
TUNNEL_TOKEN=token

‎accessories/webdav/docker-compose.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
services:
2+
3+
webdav:
4+
image: bytemark/webdav
5+
restart: always
6+
environment:
7+
- AUTH_TYPE
8+
- USERNAME
9+
- PASSWORD
10+
- TZ=Europe/Moscow
11+
volumes:
12+
- ./dav:/var/lib/dav
13+
#- /etc/timezone:/etc/timezone:ro
14+
- /etc/localtime:/etc/localtime:ro
15+
ports:
16+
- "127.0.0.1:3002:80"

‎bookmarks/betula/docker-compose.yaml

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version: '3.5'
21
services:
2+
33
betula:
44
build: .
55
container_name: betula
@@ -9,16 +9,5 @@ services:
99
restart: always
1010
labels:
1111
- "com.centurylinklabs.watchtower.enable=false"
12-
# ports:
13-
# - "1738:1738"
14-
15-
cloudflared:
16-
image: cloudflare/cloudflared:latest
17-
environment:
18-
- TUNNEL_TOKEN=token
19-
command: 'tunnel run'
20-
restart: always
21-
read_only: true
22-
user: root
23-
depends_on:
24-
- betula
12+
ports:
13+
- "1738:1738"

‎bookmarks/espial/docker-compose.yml

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version: '3'
21
services:
2+
33
espial:
44
image: 'jonschoning/espial:espial'
55
restart: always
@@ -15,13 +15,6 @@ services:
1515
# - ARCHIVE_SOCKS_PROXY_HOST=localhost
1616
# - ARCHIVE_SOCKS_PROXY_PORT=8888
1717
# - SOURCE_CODE_URI=https://github.com/jonschoning/espial
18-
labels:
19-
- "traefik.http.routers.espial.rule=Host(`${DOMAIN}`)"
20-
- "traefik.enable=true"
21-
- "traefik.backend=espial"
22-
- "traefik.docker.network=web"
23-
- "traefik.port=3000"
24-
# - "traefik.http.routers.espial.entrypoints=websecure"
25-
# - "traefik.http.routers.espial.tls.certresolver=mydnschallenge"
18+
2619
volumes:
2720
data:

‎bookmarks/linkace/docker-compose.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "3"
2-
31
services:
42

53
# --- MariaDB

‎bookmarks/linkding/docker-compose.yaml

+3-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1-
version: '3'
2-
31
services:
2+
43
linkding:
54
container_name: "${LD_CONTAINER_NAME:-linkding}"
65
image: sissbruecker/linkding:latest
76
volumes:
87
- "${LD_HOST_DATA_DIR:-./data}:/etc/linkding/data"
98
restart: always
10-
11-
cloudflared:
12-
image: cloudflare/cloudflared:latest
13-
environment:
14-
- TUNNEL_TOKEN=token
15-
command: 'tunnel run'
16-
restart: always
17-
read_only: true
18-
user: root
19-
depends_on:
20-
- linkding
9+
ports:
10+
- "127.0.0.1:3006:9090"

‎bookmarks/shiori/docker-compose.yml

-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '3'
2-
31
services:
42

53
shiori:
@@ -9,14 +7,3 @@ services:
97
- /etc/localtime:/etc/localtime:ro
108
- ./data:/shiori
119
restart: unless-stopped
12-
13-
cloudflared:
14-
image: cloudflare/cloudflared:latest
15-
environment:
16-
- TUNNEL_TOKEN
17-
command: 'tunnel run'
18-
restart: always
19-
read_only: true
20-
user: root
21-
depends_on:
22-
- shiori

‎git/forgejo/docker-compose.yml

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
version: '3'
2-
31
services:
2+
43
forgejo:
54
image: codeberg.org/forgejo/forgejo:1.21
65
environment:
@@ -11,14 +10,3 @@ services:
1110
- ./data:/data
1211
- ./config:/etc/gitea
1312
- /etc/localtime:/etc/localtime:ro
14-
15-
cloudflared:
16-
image: cloudflare/cloudflared:latest
17-
environment:
18-
- TUNNEL_TOKEN=token
19-
command: 'tunnel run'
20-
restart: always
21-
read_only: true
22-
user: root
23-
depends_on:
24-
- forgejo

0 commit comments

Comments
 (0)