From 431500f28aeb7ea695860c181ce0184669c20d13 Mon Sep 17 00:00:00 2001 From: longstone <2110765+longstone@users.noreply.github.com> Date: Thu, 7 Sep 2023 20:44:52 +0200 Subject: [PATCH] Update docker compose files to version 3.9 (#2299) * Update docker compose files to version 3.9 * Format yml files * Update changelog --------- Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com> --- CHANGELOG.md | 1 + docker/docker-compose.build.yml | 8 +++----- docker/docker-compose.dev.yml | 5 ++--- docker/docker-compose.yml | 8 +++----- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e35b9741..13f1ee105 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Improved the validation in the activities import - Improved the language localization for German (`de`) - Refreshed the cryptocurrencies list +- Changed the version in the `docker-compose` files from `3.7` to `3.9` ## 1.305.0 - 2023-09-03 diff --git a/docker/docker-compose.build.yml b/docker/docker-compose.build.yml index c32186bad..774bd16a7 100644 --- a/docker/docker-compose.build.yml +++ b/docker/docker-compose.build.yml @@ -1,4 +1,4 @@ -version: '3.7' +version: '3.9' services: ghostfolio: build: ../ @@ -7,7 +7,7 @@ services: environment: DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer NODE_ENV: production - REDIS_HOST: 'redis' + REDIS_HOST: redis REDIS_PASSWORD: ${REDIS_PASSWORD} ports: - 3333:3333 @@ -16,7 +16,6 @@ services: condition: service_healthy redis: condition: service_healthy - postgres: image: postgres:12 env_file: @@ -28,9 +27,8 @@ services: retries: 5 volumes: - postgres:/var/lib/postgresql/data - redis: - image: 'redis:alpine' + image: redis:alpine healthcheck: test: ['CMD-SHELL', 'redis-cli ping | grep PONG'] interval: 10s diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 911d0dca4..147a5a565 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -1,4 +1,4 @@ -version: '3.7' +version: '3.9' services: postgres: image: postgres:12 @@ -10,9 +10,8 @@ services: - 5432:5432 volumes: - postgres:/var/lib/postgresql/data - redis: - image: 'redis:alpine' + image: redis:alpine container_name: redis restart: unless-stopped ports: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 529f877fd..c5d6ce799 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.7' +version: '3.9' services: ghostfolio: image: ghostfolio/ghostfolio:latest @@ -7,7 +7,7 @@ services: environment: DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer NODE_ENV: production - REDIS_HOST: 'redis' + REDIS_HOST: redis REDIS_PASSWORD: ${REDIS_PASSWORD} ports: - 3333:3333 @@ -16,7 +16,6 @@ services: condition: service_healthy redis: condition: service_healthy - postgres: image: postgres:12 env_file: @@ -28,9 +27,8 @@ services: retries: 5 volumes: - postgres:/var/lib/postgresql/data - redis: - image: 'redis:alpine' + image: redis:alpine healthcheck: test: ['CMD-SHELL', 'redis-cli ping | grep PONG'] interval: 10s