diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-06-22 14:57:55 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-06-22 14:57:55 -0400 |
| commit | 983a45e17884bf9ab5b52a859d47dc4c9168a181 (patch) | |
| tree | 6abd0d3aa598b453cfff293f9a9860c670dccf2f /docker/dev | |
| parent | ceb1284f2733a8fc5e089be823bc109034589cfe (diff) | |
| parent | 96c9f801a956adb2fdc5e6afb061c01c58962e00 (diff) | |
Merge branch 'master' into iav-arm-musl-dessalines
Diffstat (limited to 'docker/dev')
| -rw-r--r-- | docker/dev/docker-compose.yml | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 1702f66d..bdcb4308 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -1,15 +1,6 @@ version: '3.3' services: - postgres: - image: postgres:12-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=password - - POSTGRES_DB=lemmy - volumes: - - ./volumes/postgres:/var/lib/postgresql/data - restart: always lemmy: build: @@ -23,16 +14,27 @@ services: volumes: - ../lemmy.hjson:/config/config.hjson depends_on: + - pictrs - postgres - - pictshare - iframely - pictshare: - image: hascheksolutions/pictshare:latest - ports: - - "127.0.0.1:8537:80" + postgres: + image: postgres:12-alpine + environment: + - POSTGRES_USER=lemmy + - POSTGRES_PASSWORD=password + - POSTGRES_DB=lemmy + volumes: + - ./volumes/postgres:/var/lib/postgresql/data + restart: always + + pictrs: + image: asonix/pictrs:v0.1.13-r0 + ports: + - "127.0.0.1:8537:8080" + user: 991:991 volumes: - - ./volumes/pictshare:/usr/share/nginx/html/data + - ./volumes/pictrs:/mnt restart: always iframely: |