diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-06-23 21:11:38 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-06-23 21:11:38 -0400 |
| commit | dc94e58cbf7e7de10d97331a3056380a3416e0b0 (patch) | |
| tree | 85ed25783b0470ead3012a9718aea50b39c940dd /docker/dev/docker-compose.yml | |
| parent | fd6a040568239d2e6949394fdc0ce0f7ac70275c (diff) | |
| parent | 790b944031f9433be765936763d848ffa6e1b496 (diff) | |
Merge branch 'master' into federation_merge_from_master_2
Diffstat (limited to 'docker/dev/docker-compose.yml')
| -rw-r--r-- | docker/dev/docker-compose.yml | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 3fc94099..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: @@ -22,17 +13,28 @@ services: - RUST_LOG=debug volumes: - ../lemmy.hjson:/config/config.hjson - depends_on: + 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: |