Skip to content

S
sun
Commit 6ce08a78 authored by 钟尚武's avatar 钟尚武
Browse files
Options

Merge branch 'master' into 'deploy/like-stage' 

增加C_FORCE_ROOT环境变量(Celery Root 用户启动)

See merge request !405
parents b66913c8 9ccc028f
Pipeline #4859 passed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 3 additions and 0 deletions
    deploy/prod/Dockerfile
    View file @ 6ce08a78
    ...@@ -9,5 +9,6 @@ RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt ...@@ -9,5 +9,6 @@ RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
    COPY . . COPY . .
    ENV PROJECT_ENV=prod ENV PROJECT_ENV=prod
    ENV C_FORCE_ROOT=true
    COPY ./deploy/prod/settings_local.py ./sun/ COPY ./deploy/prod/settings_local.py ./sun/
    CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent' CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'
    deploy/stage/Dockerfile
    View file @ 6ce08a78
    ...@@ -9,5 +9,6 @@ RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt ...@@ -9,5 +9,6 @@ RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
    COPY . . COPY . .
    ENV PROJECT_ENV=stage ENV PROJECT_ENV=stage
    ENV C_FORCE_ROOT=true
    COPY ./deploy/stage/settings_local.py ./sun/ COPY ./deploy/stage/settings_local.py ./sun/
    CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent' CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'
    deploy/test/Dockerfile
    View file @ 6ce08a78
    ...@@ -9,5 +9,6 @@ RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt ...@@ -9,5 +9,6 @@ RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
    COPY . . COPY . .
    ENV PROJECT_ENV=test ENV PROJECT_ENV=test
    ENV C_FORCE_ROOT=true
    COPY ./deploy/test/settings_local.py ./sun/ COPY ./deploy/test/settings_local.py ./sun/
    CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent' CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'
    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