diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-08 11:39:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-08 11:39:25 +0200 |
| commit | 9f9f4b248e1cb879d11b782ddcb91e7fcc3238d8 (patch) | |
| tree | b3d287fe108a29268cacb165e1285ead432965be | |
| parent | 3660f01f60bec405acab672634e184ee5b5b8e46 (diff) | |
| parent | 3c48c9ac2eb44a8de199c4d1f397be5e02520c3a (diff) | |
Merge pull request #887 from valentin2105/master
add persistance to Postresql container
| -rw-r--r-- | docker-compose.yml | 4 | ||||
| -rw-r--r-- | docs/Using-Mastodon/List-of-Mastodon-instances.md | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index d6ba66dde..103e10cbe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,13 @@ services: db: restart: always image: postgres:alpine + volumes: + - ./postgres-data:/var/lib/postgresql/data redis: restart: always image: redis:alpine + volumes: + - ./redis:/data web: restart: always build: . diff --git a/docs/Using-Mastodon/List-of-Mastodon-instances.md b/docs/Using-Mastodon/List-of-Mastodon-instances.md index ca1fa4c19..91c27b015 100644 --- a/docs/Using-Mastodon/List-of-Mastodon-instances.md +++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md @@ -45,6 +45,8 @@ There is also a list at [instances.mastodon.xyz](https://instances.mastodon.xyz) | [share.elouworld.org](https://share.elouworld.org)|N/A|No|No| | [social.lkw.tf](https://social.lkw.tf)|N/A|No|No| | [manowar.social](https://manowar.social)|N/A|No|No| +| [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|Down at time of entry|No|No| +| [mastodon.cloud](https://mastodon.cloud)|Open Mastodon instance with people from everywhere.|Yes|Yes| | [social.ballpointcarrot.net](https://social.ballpointcarrot.net)|N/A|No|No| | [social.nasqueron.org](https://social.nasqueron.org) |Dreamers, open source developers, free culture|Yes|Yes| | [status.dissidence.ovh](https://status.dissidence.ovh)|N/A|Yes|Yes| |