Updating docker-compose to version 3

- Removing health checks.
- #227
This commit is contained in:
Dessalines 2019-08-21 15:29:35 -07:00
parent c275c50b6f
commit 283d8cd692
3 changed files with 10 additions and 26 deletions

View File

@ -72,8 +72,8 @@ Make sure you have both docker and docker-compose(>=`1.24.0`) installed.
mkdir lemmy/ mkdir lemmy/
cd lemmy/ cd lemmy/
wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/docker-compose.yml
wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/env -O .env wget https://raw.githubusercontent.com/dessalines/lemmy/master/docker/prod/.env
# Edit the .env for custom passwords # Edit the .env if you want custom passwords
docker-compose up -d docker-compose up -d
``` ```
@ -125,8 +125,9 @@ and goto http://localhost:8536
#### Set up Postgres DB #### Set up Postgres DB
``` ```
psql -c "create user rrr with password 'rrr' superuser;" -U postgres psql -c "create user lemmy with password 'password' superuser;" -U postgres
psql -c 'create database rrr with owner rrr;' -U postgres psql -c 'create database lemmy with owner lemmy;' -U postgres
export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
``` ```
#### Running #### Running
@ -160,7 +161,7 @@ Lemmy is free, open-source software, meaning no advertising, monetizing, or vent
If you'd like to add translations, take a look a look at the [english translation file](ui/src/translations/en.ts). If you'd like to add translations, take a look a look at the [english translation file](ui/src/translations/en.ts).
- Languages supported: `en`, `zh`, `fr`, `sv`, `de`, `ru`, `de` - Languages supported: English (`en`), Chinese (`zh`), French (`fr`), Swedish (`sv`), German (`de`), Russian (`ru`).
## Credits ## Credits

View File

@ -1,20 +1,14 @@
version: '2.4' version: '3.3'
services: services:
lemmy_db: lemmy_db:
image: postgres:12-alpine image: postgres:12-alpine
restart: always
environment: environment:
- POSTGRES_USER=lemmy - POSTGRES_USER=lemmy
- POSTGRES_PASSWORD=${DATABASE_PASSWORD} - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
- POSTGRES_DB=lemmy - POSTGRES_DB=lemmy
volumes: volumes:
- lemmy_db:/var/lib/postgresql/data - lemmy_db:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U lemmy"]
interval: 5s
timeout: 5s
retries: 20
lemmy: lemmy:
build: build:
context: ../../ context: ../../
@ -26,9 +20,7 @@ services:
- DATABASE_URL=${DATABASE_URL} - DATABASE_URL=${DATABASE_URL}
- JWT_SECRET=${JWT_SECRET} - JWT_SECRET=${JWT_SECRET}
- HOSTNAME=${DOMAIN} - HOSTNAME=${DOMAIN}
restart: always
depends_on: depends_on:
lemmy_db: - lemmy_db
condition: service_healthy
volumes: volumes:
lemmy_db: lemmy_db:

View File

@ -1,23 +1,16 @@
version: '2.4' version: '3.3'
services: services:
lemmy_db: lemmy_db:
image: postgres:12-alpine image: postgres:12-alpine
restart: always
environment: environment:
- POSTGRES_USER=lemmy - POSTGRES_USER=lemmy
- POSTGRES_PASSWORD=${DATABASE_PASSWORD} - POSTGRES_PASSWORD=${DATABASE_PASSWORD}
- POSTGRES_DB=lemmy - POSTGRES_DB=lemmy
volumes: volumes:
- lemmy_db:/var/lib/postgresql/data - lemmy_db:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U lemmy"]
interval: 5s
timeout: 5s
retries: 20
lemmy: lemmy:
image: dessalines/lemmy:v0.0.7.3 image: dessalines/lemmy:v0.0.7.3
restart: always
ports: ports:
- "8536:8536" - "8536:8536"
environment: environment:
@ -25,9 +18,7 @@ services:
- DATABASE_URL=${DATABASE_URL} - DATABASE_URL=${DATABASE_URL}
- JWT_SECRET=${JWT_SECRET} - JWT_SECRET=${JWT_SECRET}
- HOSTNAME=${DOMAIN} - HOSTNAME=${DOMAIN}
restart: always
depends_on: depends_on:
lemmy_db: - lemmy_db
condition: service_healthy
volumes: volumes:
lemmy_db: lemmy_db: