From 66a9db86b3047971124dadc18f49149d7cafa604 Mon Sep 17 00:00:00 2001
From: PLUJA <64632615+pluja@users.noreply.github.com>
Date: Thu, 1 Oct 2020 15:28:19 +0200
Subject: [PATCH 1/2] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 6304d4e..30b4e73 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,8 @@ I always recommend self-hosting, as you will be the only person with access to y
| name |server location|max users|registrations|
| ------------ | ------------ | ------------ |------------|
| https://yotter.xyz |Germany| 75 users|
|
-| https://yotter.kavin.rocks/ |India| 100 users |
|
-| https://yotter.jank.media/ |Germany| 100 users|
|
+| https://yotter.kavin.rocks/ |India| 100 users |
|
+| https://yotter.jank.media/ |Germany| 100 users|
|
# Contributing
Contributors are always welcome. You can help in many ways: Coding, organizing, designing, [donating](#donate), maintaining... You choose what you want to help with!
From a00a34610f6afca1f2fad242434f2a5ae8927075 Mon Sep 17 00:00:00 2001
From: Nico769
Date: Thu, 1 Oct 2020 19:20:57 +0200
Subject: [PATCH 2/2] Fixes ytorg/Yotter#87 and removes redundant ports option
---
Dockerfile | 3 ++-
docker-compose.yml | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 65117c7..2896a5d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,8 @@ RUN flask db init \
&& flask db migrate \
&& flask db upgrade
-CMD flask db migrate \
+CMD flask db stamp head \
+ && flask db migrate \
&& flask db upgrade \
&& gunicorn -b 0.0.0.0:5000 -w 4 yotter:app
diff --git a/docker-compose.yml b/docker-compose.yml
index 8650ec0..8eeb821 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,8 +21,6 @@ services:
DATABASE_URL: mysql+pymysql://yotter:changeme@mariadb:3306/yotter
depends_on:
- mariadb
- ports:
- - "5000:5000"
volumes:
- migrations:/usr/src/app/migrations
- ./yotter-config.json:/usr/src/app/yotter-config.json