Skip to content

Commit

Permalink
Bump docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
schnapster committed Nov 17, 2024
1 parent b7cd252 commit 8ea476f
Showing 4 changed files with 9 additions and 11 deletions.
10 changes: 5 additions & 5 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.6'

networks:
traefik:
dockersock4traefik:
4 changes: 2 additions & 2 deletions docker/deploy/docker-update.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 8ea476f

Please sign in to comment.