Browse Source

Reorganizing docker compose files.

- Fixes #197
online_users
Dessalines 2 years ago
parent
commit
b3e363828c
  1. 4
      README.md
  2. 0
      docker/dev/Dockerfile
  3. 13
      docker/dev/docker-compose.yml
  4. 1
      docker/docker_db_backup.sh
  5. 5
      docker/docker_update.sh
  6. 0
      docker/prod/docker-compose.yml
  7. 1
      docker_db_backup.sh
  8. 5
      docker_update.sh

4
README.md

@ -70,7 +70,7 @@ Make sure you have both docker and docker-compose(>=`1.24.0`) installed.
```
mkdir lemmy/
cd lemmy/
wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/docker-compose.yml
wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml
docker-compose up -d
```
@ -98,7 +98,7 @@ location / {
```
git clone https://github.com/dessalines/lemmy
cd lemmy
cd lemmy/docker
./docker_update.sh # This pulls the newest version, builds and runs it
```

0
Dockerfile → docker/dev/Dockerfile

13
docker-compose.yml → docker/dev/docker-compose.yml

@ -1,7 +1,7 @@
version: '2.4'
services:
db:
lemmy_db:
image: postgres:12-alpine
restart: always
environment:
@ -9,7 +9,7 @@ services:
POSTGRES_PASSWORD: rrr
POSTGRES_DB: rrr
volumes:
- db:/var/lib/postgresql/data
- lemmy_db:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U rrr"]
interval: 5s
@ -17,17 +17,18 @@ services:
retries: 20
lemmy:
build:
context: .
context: ../../
dockerfile: docker/dev/Dockerfile
ports:
- "8536:8536"
environment:
LEMMY_FRONT_END_DIR: /app/dist
DATABASE_URL: postgres://rrr:rrr@db:5432/rrr
DATABASE_URL: postgres://rrr:rrr@lemmy_db:5432/rrr
JWT_SECRET: changeme
HOSTNAME: rrr
restart: always
depends_on:
db:
lemmy_db:
condition: service_healthy
volumes:
db:
lemmy_db:

1
docker/docker_db_backup.sh

@ -0,0 +1 @@
docker exec -it dev_lemmy_db_1 pg_dumpall -c -U rrr > dump_`date +%Y-%m-%d"_"%H_%M_%S`.sql

5
docker/docker_update.sh

@ -0,0 +1,5 @@
#!/bin/sh
set -e
git pull
docker-compose -f dev/docker-compose.yml up -d --no-deps --build

0
docker/docker-compose.yml → docker/prod/docker-compose.yml

1
docker_db_backup.sh

@ -1 +0,0 @@
docker exec -it lemmy_db_1 pg_dumpall -c -U rrr > dump_`date +%Y-%m-%d"_"%H_%M_%S`.sql

5
docker_update.sh

@ -1,5 +0,0 @@
#!/bin/sh
set -e
git pull
docker-compose up -d --no-deps --build
Loading…
Cancel
Save