diff --git a/.gitignore b/.gitignore index 62debff..204c7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .env +docker-compose.override.yml volumes/** \ No newline at end of file diff --git a/README.md b/README.md index 8bbccef..6cdbb69 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,7 @@ docker compose -f compose//docker-compose.yml up -d ## Todo - [ ] Put all config files in `compose/` -- [ ] Use .env files for configs -- [ ] Use .env files for secrets -- [ ] Use .env files for volume binds -- [ ] Provide example .env files +- [x] Provide example .env files - [x] Gitignore actual .env - [x] Gitignore folders and files in `volumes/` - [ ] Add README to every service describing required env variables, commands and volumes diff --git a/compose/filebrowser/.env.example b/compose/filebrowser/.env.example index 6eb39e8..f12d10b 100644 --- a/compose/filebrowser/.env.example +++ b/compose/filebrowser/.env.example @@ -1,3 +1,3 @@ -HTTP_PORT="8080" DATA_PATH="/path/to/your/data" +CONFIG_PATH="../../volumes/filebrowser" FB_BASEURL="/" \ No newline at end of file diff --git a/compose/filebrowser/docker-compose.yml b/compose/filebrowser/docker-compose.yml index b7dc638..b38ebc4 100644 --- a/compose/filebrowser/docker-compose.yml +++ b/compose/filebrowser/docker-compose.yml @@ -2,14 +2,12 @@ services: filebrowser: image: hurlenko/filebrowser container_name: filebrowser - env_file: - - .env - user: "${PUID:-1000}:${PGID:-1000}" + user: "1000:1000" ports: - - "${HTTP_PORT:-8080}:8080" + - "10943:8080" volumes: - - "${DATA_PATH:?DATA_PATH not set}:/data" - - "${VOLUMES_DIR:?VOLUMES_DIR not set}/filebrowser:/config" + - "${DATA_PATH:?}:/data" + - "${CONFIG_PATH:?}:/config" environment: - FB_BASEURL: "${FB_BASEURL:-/}" restart: unless-stopped \ No newline at end of file diff --git a/compose/watchtower/.env.example b/compose/watchtower/.env.example index f540596..c7f0caa 100644 --- a/compose/watchtower/.env.example +++ b/compose/watchtower/.env.example @@ -1,5 +1,6 @@ +TZ="Europe/Rome" WATCHTOWER_CLEANUP="true" WATCHTOWER_SCHEDULE="0 0 4 * * ?" -WATCHTOWER_NOTIFICATION_URL="" # Update only containers without a com.centurylinklabs.watchtower.scope label -WATCHTOWER_SCOPE="none" \ No newline at end of file +WATCHTOWER_SCOPE="none" +WATCHTOWER_NOTIFICATION_URL="" \ No newline at end of file diff --git a/compose/watchtower/docker-compose.yml b/compose/watchtower/docker-compose.yml index 816462b..455435f 100644 --- a/compose/watchtower/docker-compose.yml +++ b/compose/watchtower/docker-compose.yml @@ -2,14 +2,12 @@ services: watchtower: image: containrrr/watchtower container_name: watchtower - env_file: - - .env volumes: - /var/run/docker.sock:/var/run/docker.sock environment: - TZ: "${TZ:-Europe/Rome}" + TZ: "${TZ:-Etc/UTC}" WATCHTOWER_CLEANUP: "${WATCHTOWER_CLEANUP:-false}" - WATCHTOWER_SCHEDULE: "${WATCHTOWER_SCHEDULE:?WATCHTOWER_SCHEDULE not set}" + WATCHTOWER_SCHEDULE: "${WATCHTOWER_SCHEDULE:-0 0 0 * * ?}" WATCHTOWER_SCOPE: "${WATCHTOWER_SCOPE:-}" WATCHTOWER_NOTIFICATION_URL: "${WATCHTOWER_NOTIFICATION_URL:-}" restart: always \ No newline at end of file