diff options
| author | nutomic <nutomic@noreply.yerbamate.dev> | 2020-03-09 16:50:28 +0000 |
|---|---|---|
| committer | dessalines <dessalines@noreply.yerbamate.dev> | 2020-03-09 16:50:28 +0000 |
| commit | bf1db428f6cd9611574d09e4a8fd99fee8636e03 (patch) | |
| tree | 6a328e7b597183e7161215cfc0c3a1ad12fffa6a /docker/dev | |
| parent | f8ea6a527daa2003a87b5bfce0e92ba86896b53b (diff) | |
Move volumes into subfolder (ref #474) (#23)
Change ports and container names
Move volumes into subfolder (ref #474)
Merge pull request #587 from StaticallyTypedRice/patch-2
Clarify that content violating this code of conduct will likely be removed.
Clarify that content violating this code of conduct will likely be removed.
Lemmy has a general policy of removing any content that violates the rules whenever possible, which is typically a good thing, and I felt it important to mention that in the code of conduct.
Co-authored-by: Felix <me@nutomic.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Richie Zhang <12566991+StaticallyTypedRice@users.noreply.github.com>
Diffstat (limited to 'docker/dev')
| -rw-r--r-- | docker/dev/docker-compose.yml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 987be4d5..64ba1db4 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -1,15 +1,16 @@ version: '3.3' services: - lemmy_db: + postgres: image: postgres:12-alpine environment: - POSTGRES_USER=lemmy - POSTGRES_PASSWORD=password - POSTGRES_DB=lemmy volumes: - - lemmy_db:/var/lib/postgresql/data + - ./volumes/postgres:/var/lib/postgresql/data restart: always + lemmy: build: context: ../../ @@ -20,22 +21,22 @@ services: volumes: - ../lemmy.hjson:/config/config.hjson:ro depends_on: - - lemmy_db - lemmy_pictshare: + - postgres + - pictshare + - iframely + + pictshare: image: shtripok/pictshare:latest ports: - "127.0.0.1:8537:80" volumes: - - lemmy_pictshare:/usr/share/nginx/html/data + - ./volumes/pictshare:/usr/share/nginx/html/data restart: always - lemmy_iframely: + + iframely: image: dogbin/iframely:latest ports: - - "127.0.0.1:8061:8061" + - "127.0.0.1:8061:80" volumes: - ../iframely.config.local.js:/iframely/config.local.js:ro restart: always -volumes: - lemmy_db: - lemmy_pictshare: - lemmy_iframely: |