feat: gitea workflow with Uploader check is runing, plus in server.py is checker too
This commit is contained in:
parent
0d87d3d889
commit
89021ea018
|
@ -25,8 +25,18 @@ jobs:
|
|||
git_remote_url: 'ssh://dokku@v2.discours.io:22/discoursio-api'
|
||||
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
|
||||
- name: Check UPLOADER is running
|
||||
id: check_container
|
||||
uses: appleboy/ssh-action@master
|
||||
with:
|
||||
host: staging.discours.io
|
||||
username: dokku
|
||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
script: docker ps | grep 'uploader'
|
||||
continue-on-error: true
|
||||
|
||||
- name: Push to dokku for dev branch
|
||||
if: github.ref == 'refs/heads/dev'
|
||||
if: github.ref == 'refs/heads/dev' && steps.check_container.outcome == 'success'
|
||||
uses: dokku/github-action@master
|
||||
with:
|
||||
branch: 'dev'
|
||||
|
|
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -151,3 +151,5 @@ poetry.lock
|
|||
.ruff_cache
|
||||
.jj
|
||||
.zed
|
||||
|
||||
dokku_config
|
||||
|
|
35
dokku_config
35
dokku_config
|
@ -1,35 +0,0 @@
|
|||
root@v2:~/robo_script# dokku config:show discoursio-api
|
||||
=====> discoursio-api env vars
|
||||
ACKEE_TOKEN: f69b4a62-79db-49f5-b8a1-4e157d4079b8
|
||||
BACKEND_URL: https://v2.discours.io
|
||||
CDN_DOMAIN: cdn.discours.io
|
||||
COOKIE_DOMAIN: .discours.io
|
||||
DATABASE_URL: postgresql://postgres:ea4a46965ec298f75e4a28bb2057823e@172.17.0.9:5432/discoursio_db_2024_04_21
|
||||
DOKKU_APP_RESTORE: 1
|
||||
DOKKU_APP_TYPE: dockerfile
|
||||
DOKKU_DOCKERFILE_PORTS: 8080
|
||||
DOKKU_PROXY_PORT: 80
|
||||
DOKKU_PROXY_SSL_PORT: 443
|
||||
FACEBOOK_OAUTH_ID: 1140141389943829
|
||||
FACEBOOK_OAUTH_KEY: 4e9db2db988151b403a43a554065d23b
|
||||
FRONTEND_URL: https://discoursio-webapp-git-feature-googleoauth-discoursio.vercel.app/
|
||||
GITHUB_OAUTH_ID: b285bf5ed53a2bceb899
|
||||
GITHUB_OAUTH_KEY: b374027774e439123179265314aabf646fea1a55
|
||||
GIT_REV: fbd0e03a3396ec5d1e8c5a0cc658467cec566a6c
|
||||
GOOGLE_OAUTH_ID: 648983473866-2hd6v2eqqk6hhqabfhuqq2slb2fkfvve.apps.googleusercontent.com
|
||||
GOOGLE_OAUTH_KEY: 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
|
||||
JWT_SECRET_KEY: 03vntirucmw309p4p8tvuca0w4
|
||||
MAILGUN_API_KEY: key-ab6609e797cf6bea695c39079d5e1dba
|
||||
MAILGUN_DOMAIN: discours.io
|
||||
OAUTH_CALLBACK_URL: https://new.discours.io/confirm
|
||||
OAUTH_REDIRECT_URL: https://v2.discours.io/oauth-authorize
|
||||
REDIS_URL: redis://:a932edc3ec57b3df7bc3120473774b500c0ec6174e08654434986ec3f77b3e49@dokku-redis-discoursio-redis:6379
|
||||
SENTRY_DSN: https://b537b9504258427dae86502e2bb9c4ce@glitchtip.discours.io/2
|
||||
SENTRY_ID: 393bd0b9713245089fb2c1df0e45cbfc
|
||||
SESSION_SECRET_KEY: PwMhr8e5ZneKuNe5
|
||||
STORJ_ACCESS_KEY: jwroxpcugy4x2t7f2zghgsqnwvaq
|
||||
STORJ_BUCKET_NAME: discours-io
|
||||
STORJ_END_POINT: https://gateway.storjshare.io
|
||||
STORJ_SECRET_KEY: jyo6b2xc3bd65u3vw7x3gm3f3gcu4khmdrtaz2sxaez44wsd2zyum
|
||||
VK_OAUTH_ID: 55L7N3U8SilJWaE1kEwr
|
||||
VK_OAUTH_KEY: 782c7cce782c7cce782c7cce337b3df5447782c782c7cce1b549757d0c219fb895bde1d
|
|
@ -64,6 +64,16 @@ server {
|
|||
proxy_cache_lock on;
|
||||
}
|
||||
|
||||
# Custom location block for /upload
|
||||
location /connect/ {
|
||||
http://upload-8080/;
|
||||
{{ $proxy_settings }}
|
||||
{{ $gzip_settings }}
|
||||
{{ $cors_headers_options }}
|
||||
{{ $cors_headers_post }}
|
||||
{{ $cors_headers_get }}
|
||||
}
|
||||
|
||||
location ~* \.(jpg|jpeg|png|gif|ico|css|js)$ {
|
||||
expires 30d; # This means that the client can cache these resources for 30 days.
|
||||
add_header Cache-Control "public, no-transform";
|
||||
|
|
27
server.py
27
server.py
|
@ -1,18 +1,27 @@
|
|||
import subprocess
|
||||
from granian.constants import Interfaces
|
||||
from granian.server import Granian
|
||||
|
||||
from services.logger import root_logger as logger
|
||||
from settings import PORT
|
||||
|
||||
def is_docker_container_running(name):
|
||||
cmd = ['docker', 'ps', '-f', f'name={name}']
|
||||
output = subprocess.run(cmd, capture_output=True, text=True).stdout
|
||||
return name in output
|
||||
|
||||
if __name__ == "__main__":
|
||||
logger.info("started")
|
||||
|
||||
granian_instance = Granian(
|
||||
"main:app",
|
||||
address="0.0.0.0", # noqa S104
|
||||
port=PORT,
|
||||
threads=4,
|
||||
websockets=False,
|
||||
interface=Interfaces.ASGI,
|
||||
)
|
||||
granian_instance.serve()
|
||||
if is_docker_container_running('uploader'):
|
||||
granian_instance = Granian(
|
||||
"main:app",
|
||||
address="0.0.0.0", # noqa S104
|
||||
port=PORT,
|
||||
threads=4,
|
||||
websockets=False,
|
||||
interface=Interfaces.ASGI,
|
||||
)
|
||||
granian_instance.serve()
|
||||
else:
|
||||
logger.info("'uploader' is not running. But very needed !!! \(^.^'\)")
|
Loading…
Reference in New Issue
Block a user