Merge branch 'dev-indep' of https://github.com/ytorg/yotter into dev-indep

This commit is contained in:
pluja 2020-10-02 13:50:39 +02:00
commit e911deb425
3 changed files with 4 additions and 5 deletions

View File

@ -29,7 +29,8 @@ RUN flask db init \
&& flask db migrate \ && flask db migrate \
&& flask db upgrade && flask db upgrade
CMD flask db migrate \ CMD flask db stamp head \
&& flask db migrate \
&& flask db upgrade \ && flask db upgrade \
&& gunicorn -b 0.0.0.0:5000 -w 4 yotter:app && gunicorn -b 0.0.0.0:5000 -w 4 yotter:app

View File

@ -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| | name |server location|max users|registrations|
| ------------ | ------------ | ------------ |------------| | ------------ | ------------ | ------------ |------------|
| https://yotter.xyz |Germany| 75 users|<img src="https://yotter.xyz/registrations_status/icon?2" width="17">| | https://yotter.xyz |Germany| 75 users|<img src="https://yotter.xyz/registrations_status/icon?2" width="17">|
| https://yotter.kavin.rocks/ |India| 100 users |<img src="https://yotter.kavin.rocks/registrations_status/icon?2" width="15">| | https://yotter.kavin.rocks/ |India| 100 users |<img src="https://yotter.kavin.rocks/registrations_status/icon?3" width="15">|
| https://yotter.jank.media/ |Germany| 100 users|<img src="https://yotter.jank.media/registrations_status/icon?2" width="15">| | https://yotter.jank.media/ |Germany| 100 users|<img src="https://yotter.jank.media/registrations_status/icon?3" width="15">|
# Contributing # 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! Contributors are always welcome. You can help in many ways: Coding, organizing, designing, [donating](#donate), maintaining... You choose what you want to help with!

View File

@ -21,8 +21,6 @@ services:
DATABASE_URL: mysql+pymysql://yotter:changeme@mariadb:3306/yotter DATABASE_URL: mysql+pymysql://yotter:changeme@mariadb:3306/yotter
depends_on: depends_on:
- mariadb - mariadb
ports:
- "5000:5000"
volumes: volumes:
- migrations:/usr/src/app/migrations - migrations:/usr/src/app/migrations
- ./yotter-config.json:/usr/src/app/yotter-config.json - ./yotter-config.json:/usr/src/app/yotter-config.json