Commit 71637a1c authored by nanahira's avatar nanahira

config git url

parent 832f5d04
...@@ -36,4 +36,5 @@ ENV TAIKO_REDIS_HOST 127.0.0.1 ...@@ -36,4 +36,5 @@ ENV TAIKO_REDIS_HOST 127.0.0.1
ENV TAIKO_REDIS_PORT 6379 ENV TAIKO_REDIS_PORT 6379
#ENV TAIKO_REDIS_PASSWORD blank #ENV TAIKO_REDIS_PASSWORD blank
ENV TAIKO_REDIS_DB 0 ENV TAIKO_REDIS_DB 0
ENV TAIKO_GIT_URL https://git.example.com/user/
CMD [ "/taiko-web/docker/entrypoint.sh" ] CMD [ "/taiko-web/docker/entrypoint.sh" ]
...@@ -11,7 +11,6 @@ from flask_caching import Cache ...@@ -11,7 +11,6 @@ from flask_caching import Cache
from ffmpy import FFmpeg from ffmpy import FFmpeg
DATABASE = 'taiko.db' DATABASE = 'taiko.db'
DEFAULT_URL = 'https://github.com/purerosefallen/taiko-web-another/'
def get_db(): def get_db():
...@@ -43,13 +42,15 @@ def get_config(): ...@@ -43,13 +42,15 @@ def get_config():
config['songs_baseurl'] = ''.join([request.host_url, 'songs']) + '/' config['songs_baseurl'] = ''.join([request.host_url, 'songs']) + '/'
if not config.get('assets_baseurl'): if not config.get('assets_baseurl'):
config['assets_baseurl'] = ''.join([request.host_url, 'assets']) + '/' config['assets_baseurl'] = ''.join([request.host_url, 'assets']) + '/'
if not config.get('git_url'):
config['git_url'] = 'https://git.example.com/user/'
config['_version'] = get_version() config['_version'] = get_version(config.get('git_url'))
return config return config
def get_version(): def get_version(git_url):
version = {'commit': None, 'commit_short': '', 'version': None, 'url': DEFAULT_URL} version = {'commit': None, 'commit_short': '', 'version': None, 'url': git_url}
if os.path.isfile('version.json'): if os.path.isfile('version.json'):
try: try:
ver = json.load(open('version.json', 'r')) ver = json.load(open('version.json', 'r'))
......
#!/bin/bash #!/bin/bash
echo "{\"songs_baseurl\":\"$TAIKO_URL/songs/\",\"assets_baseurl\":\"$TAIKO_URL/assets/\",\"email\":\"$TAIKO_EMAIL\",\"redis_host\":\"$TAIKO_REDIS_HOST\",\"redis_port\":$TAIKO_REDIS_PORT,\"redis_password\":\"$TAIKO_REDIS_PASSWORD\",\"redis_db\":$TAIKO_REDIS_DB}" | tee ./config.json echo "{\"songs_baseurl\":\"$TAIKO_URL/songs/\",\"assets_baseurl\":\"$TAIKO_URL/assets/\",\"email\":\"$TAIKO_EMAIL\",\"redis_host\":\"$TAIKO_REDIS_HOST\",\"redis_port\":$TAIKO_REDIS_PORT,\"redis_password\":\"$TAIKO_REDIS_PASSWORD\",\"redis_db\":$TAIKO_REDIS_DB,\"git_url\":\"$TAIKO_GIT_URL\"}" | tee ./config.json
echo "{\"commit\":\"$(git log --pretty=%H -1)\",\"commit_short\":\"$(git log --pretty=%h -1)\",\"version\": \"$TAIKO_VERSION\"}" | tee ./version.json echo "{\"commit\":\"$(git log --pretty=%H -1)\",\"commit_short\":\"$(git log --pretty=%h -1)\",\"version\": \"$TAIKO_VERSION\"}" | tee ./version.json
pm2-docker start ./docker/pm2-docker.json pm2-docker start ./docker/pm2-docker.json
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment