Skip to content

P
physical
Commit f5ab5eed authored by 钟尚武's avatar 钟尚武
Browse files
Options

Merge branch 'refactor' into 'master' 

fix dockerfile

See merge request !587
parents e0457d13 27149471
Pipeline #4806 passed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 3 additions and 3 deletions
    deploy/prod/Dockerfile
    View file @ f5ab5eed
    ...@@ -11,6 +11,6 @@ COPY . . ...@@ -11,6 +11,6 @@ COPY . .
    ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml" ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
    ENV PROJECT_ENV=prod ENV PROJECT_ENV=prod
    COPY ./deploy/prod/app_conf.xml . COPY ./deploy/prod/app_conf.xml .
    COPY ./deploy/prod/settings_local.py ./settings/ COPY ./deploy/prod/settings_local.py ./physical/
    CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log' CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log'
    deploy/stage/Dockerfile
    View file @ f5ab5eed
    ...@@ -11,6 +11,6 @@ COPY . . ...@@ -11,6 +11,6 @@ COPY . .
    ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml" ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
    ENV PROJECT_ENV=stage ENV PROJECT_ENV=stage
    COPY ./deploy/stage/app_conf.xml . COPY ./deploy/stage/app_conf.xml .
    COPY ./deploy/stage/settings_local.py ./settings/ COPY ./deploy/stage/settings_local.py ./physical/
    CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log' CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log'
    deploy/test/Dockerfile
    View file @ f5ab5eed
    ...@@ -11,5 +11,5 @@ COPY . . ...@@ -11,5 +11,5 @@ COPY . .
    ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml" ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
    ENV PROJECT_ENV=test ENV PROJECT_ENV=test
    COPY ./deploy/test/app_conf.xml . COPY ./deploy/test/app_conf.xml .
    COPY ./deploy/test/settings_local.py ./settings/ COPY ./deploy/test/settings_local.py ./physical/
    CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log' CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log'
    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