about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-08 12:25:23 +0200
committerGitHub <noreply@github.com>2017-04-08 12:25:23 +0200
commit211920b622aba0d7c9200dabd8e2d011476333c4 (patch)
treeefbfb598482a666e9b0c98db86d325a4475bf23f
parent01d800386716748d9343c9dafd62953ab0af2cf3 (diff)
Revert "add persistance to Postresql container" (#1251)
-rw-r--r--docker-compose.yml4
-rw-r--r--docs/Using-Mastodon/List-of-Mastodon-instances.md2
2 files changed, 0 insertions, 6 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 103e10cbe..d6ba66dde 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,13 +3,9 @@ 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 91c27b015..ca1fa4c19 100644
--- a/docs/Using-Mastodon/List-of-Mastodon-instances.md
+++ b/docs/Using-Mastodon/List-of-Mastodon-instances.md
@@ -45,8 +45,6 @@ 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|