From 8ea476f65837c11d4bdf0f65bdb81584fef02877 Mon Sep 17 00:00:00 2001 From: Napster Date: Sun, 17 Nov 2024 14:13:19 +0100 Subject: [PATCH] Bump docker compose --- DEVELOPING.md | 10 +++++----- .../deploy/{docker-compose.yml => docker-compose.yaml} | 2 -- docker/deploy/docker-update.sh | 4 ++-- frontend/README.md | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) rename docker/deploy/{docker-compose.yml => docker-compose.yaml} (99%) diff --git a/DEVELOPING.md b/DEVELOPING.md index ae950d97..6c1dcc6b 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -42,17 +42,17 @@ development. #### PostgreSQL This project uses the [PostgreSQL](https://www.postgresql.org/) relational database to store and query important data. The currently used version can be found in the [poggres repo](https://github.com/CapybaraLabs/poggres). -Installing it is optional, running the development `docker-compose` is recommended instead: +Installing it is optional, running the development `docker compose` is recommended instead: ```shell script -docker-compose -f docker/dev/docker-compose.yaml up -d +docker compose -f docker/dev/docker-compose.yaml up -d ``` #### Redis This project uses the [Redis](https://redis.io/) in-memory key-value database to store expiring data and caches. -The currently used version can be found in the [dev docker-compose](docker/dev/docker-compose.yaml) file. -Installing it is optional, running the development `docker-compose` is recommended instead: +The currently used version can be found in the [dev docker compose](docker/dev/docker-compose.yaml) file. +Installing it is optional, running the development `docker compose` is recommended instead: ```shell script -docker-compose -f docker/dev/docker-compose.yaml up -d +docker compose -f docker/dev/docker-compose.yaml up -d ``` ## Code Formatting diff --git a/docker/deploy/docker-compose.yml b/docker/deploy/docker-compose.yaml similarity index 99% rename from docker/deploy/docker-compose.yml rename to docker/deploy/docker-compose.yaml index 9b03a710..6252e7c2 100644 --- a/docker/deploy/docker-compose.yml +++ b/docker/deploy/docker-compose.yaml @@ -1,5 +1,3 @@ -version: '3.6' - networks: traefik: dockersock4traefik: diff --git a/docker/deploy/docker-update.sh b/docker/deploy/docker-update.sh index 22ed15c1..a75ba105 100755 --- a/docker/deploy/docker-update.sh +++ b/docker/deploy/docker-update.sh @@ -4,6 +4,6 @@ # 0 9 * * * cd /home/foo/wolfia && ./docker-update.sh &>> logs/cron.log echo $(date) -docker-compose pull -docker-compose up -d --remove-orphans +docker compose pull +docker compose up -d --remove-orphans docker image prune --force diff --git a/frontend/README.md b/frontend/README.md index 454a4389..9c42abfa 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -30,7 +30,7 @@ or #### Backend Setup - Install [Java 11+ using sdkman](https://sdkman.io/) - Install [docker](https://docs.docker.com/engine/install/) -- Install [docker-compose](https://docs.docker.com/compose/install/) +- Install [docker compose](https://docs.docker.com/compose/install/) - Fill out the [wolfia-secrets.example.yaml](../wolfia-secrets.example.yaml) file - Rename the [wolfia-secrets.example.yaml](../wolfia-secrets.example.yaml) to `wolfia-secrets.yaml` - Copy or move it to [src/main/resources/](../src/main/resources) (a symlink is also a great idea) @@ -39,7 +39,7 @@ or #### Start Backend - Start docker containers with: ```shell script -docker-compose -f docker/dev/docker-compose.yaml up -d +docker compose -f docker/dev/docker-compose.yaml up -d ``` - Start backend with: ```shell script