updated radicale and docker compose, almost can also use nginx

This commit is contained in:
Aaro Koivukangas
2024-03-04 22:25:20 +02:00
parent d4fef4d320
commit 8a4d2c7bf6
3 changed files with 20 additions and 19 deletions
+1
View File
@@ -4,3 +4,4 @@ timetrials
reaktor-backend
data
.htpasswd
radicale/radicale
+16 -19
View File
@@ -18,7 +18,9 @@ services:
- "8080:8080"
brewery:
build: ./services/brewery
build:
context: ./services/brewery
dockerfile: Dockerfile
command: sh -c "./bin/rails db:create; ./bin/rails db:prepare; ./bin/rails server -e production"
ports:
- "5555:3000"
@@ -72,10 +74,14 @@ services:
cap_drop:
- ALL
cap_add:
- CHOWN
- SETUID
- SETGID
- CHOWN
- KILL
environment:
TAKE_FILE_OWNERSHIP: true
#UID: 2999
#GID: 2999
deploy:
resources:
limits:
@@ -90,20 +96,11 @@ services:
- ./data/radicale/:/data/
- ./radicale/config:/config:ro
# nginx:
# build:
# context: nginx
# ports:
# - 80:80
# - 443:443
# volumes:
# - ./nginx/conf:/etc/nginx
# - ./data/letsencrypt:/etc/letsencrypt/:rw
# - certbot-var:/var/lib/letsencrypt
# #- web-root:/var/www/html
#
# #command: "certonly --nginx --email aaro.koivukangas@gmail.com --non-interactive --agree-tos -d pumppi.dev -d brewery.pumppi.dev -d cal.pumppi.dev -d git.pumppi.dev -d reaktor.pumppi.dev -d tsoha.pumppi.dev -d www.pumppi.dev"
#
#volumes:
#certbot-etc:
#certbot-var:
nginx:
image: nginx
ports:
- 80:80
- 443:443
volumes:
- ./nginx/conf/:/etc/nginx/:rw
- /etc/letsencrypt/:/etc/letsencrypt/:rw
+3
View File
@@ -9,3 +9,6 @@ htpasswd_encryption = md5
[storage]
filesystem_folder = /data/collections
[logging]
level = warn