mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-02-03 13:14:28 +03:00
Remove .sh ext from executable scripts
This commit is contained in:
parent
90953a83f2
commit
849f64e1a5
|
@ -19,22 +19,22 @@ RUN apk update \
|
||||||
COPY ./requirements /requirements
|
COPY ./requirements /requirements
|
||||||
RUN pip install -r /requirements/local.txt
|
RUN pip install -r /requirements/local.txt
|
||||||
|
|
||||||
COPY ./compose/production/django/entrypoint.sh /entrypoint.sh
|
COPY ./compose/production/django/entrypoint /entrypoint
|
||||||
RUN sed -i 's/\r//' /entrypoint.sh
|
RUN sed -i 's/\r//' /entrypoint
|
||||||
RUN chmod +x /entrypoint.sh
|
RUN chmod +x /entrypoint
|
||||||
|
|
||||||
COPY ./compose/local/django/start.sh /start.sh
|
COPY ./compose/local/django/start /start
|
||||||
RUN sed -i 's/\r//' /start.sh
|
RUN sed -i 's/\r//' /start
|
||||||
RUN chmod +x /start.sh
|
RUN chmod +x /start
|
||||||
{% if cookiecutter.use_celery == "y" %}
|
{% if cookiecutter.use_celery == "y" %}
|
||||||
COPY ./compose/local/django/celery/worker/start.sh /start-celeryworker.sh
|
COPY ./compose/local/django/celery/worker/start /start-celeryworker
|
||||||
RUN sed -i 's/\r//' /start-celeryworker.sh
|
RUN sed -i 's/\r//' /start-celeryworker
|
||||||
RUN chmod +x /start-celeryworker.sh
|
RUN chmod +x /start-celeryworker
|
||||||
|
|
||||||
COPY ./compose/local/django/celery/beat/start.sh /start-celerybeat.sh
|
COPY ./compose/local/django/celery/beat/start /start-celerybeat
|
||||||
RUN sed -i 's/\r//' /start-celerybeat.sh
|
RUN sed -i 's/\r//' /start-celerybeat
|
||||||
RUN chmod +x /start-celerybeat.sh
|
RUN chmod +x /start-celerybeat
|
||||||
{% endif %}
|
{% endif %}
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint"]
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o pipefail
|
|
||||||
set -o nounset
|
|
||||||
set -o xtrace
|
|
||||||
|
|
||||||
|
|
||||||
rm -f './celerybeat.pid'
|
|
||||||
celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
|
|
|
@ -1,9 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o pipefail
|
|
||||||
set -o nounset
|
|
||||||
set -o xtrace
|
|
||||||
|
|
||||||
|
|
||||||
celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO
|
|
|
@ -1,10 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -o errexit
|
|
||||||
set -o pipefail
|
|
||||||
set -o nounset
|
|
||||||
set -o xtrace
|
|
||||||
|
|
||||||
|
|
||||||
python manage.py migrate
|
|
||||||
python manage.py runserver_plus 0.0.0.0:8000
|
|
|
@ -19,23 +19,23 @@ COPY ./requirements /requirements
|
||||||
RUN pip install --no-cache-dir -r /requirements/production.txt \
|
RUN pip install --no-cache-dir -r /requirements/production.txt \
|
||||||
&& rm -rf /requirements
|
&& rm -rf /requirements
|
||||||
|
|
||||||
COPY ./compose/production/django/gunicorn.sh /gunicorn.sh
|
COPY ./compose/production/django/gunicorn /gunicorn
|
||||||
RUN sed -i 's/\r//' /gunicorn.sh
|
RUN sed -i 's/\r//' /gunicorn
|
||||||
RUN chmod +x /gunicorn.sh
|
RUN chmod +x /gunicorn
|
||||||
RUN chown django /gunicorn.sh
|
RUN chown django /gunicorn
|
||||||
|
|
||||||
COPY ./compose/production/django/entrypoint.sh /entrypoint.sh
|
COPY ./compose/production/django/entrypoint /entrypoint
|
||||||
RUN sed -i 's/\r//' /entrypoint.sh
|
RUN sed -i 's/\r//' /entrypoint
|
||||||
RUN chmod +x /entrypoint.sh
|
RUN chmod +x /entrypoint
|
||||||
RUN chown django /entrypoint.sh
|
RUN chown django /entrypoint
|
||||||
{% if cookiecutter.use_celery == "y" %}
|
{% if cookiecutter.use_celery == "y" %}
|
||||||
COPY ./compose/production/django/celery/worker/start.sh /start-celeryworker.sh
|
COPY ./compose/production/django/celery/worker/start /start-celeryworker
|
||||||
RUN sed -i 's/\r//' /start-celeryworker.sh
|
RUN sed -i 's/\r//' /start-celeryworker
|
||||||
RUN chmod +x /start-celeryworker.sh
|
RUN chmod +x /start-celeryworker
|
||||||
|
|
||||||
COPY ./compose/production/django/celery/beat/start.sh /start-celerybeat.sh
|
COPY ./compose/production/django/celery/beat/start /start-celerybeat
|
||||||
RUN sed -i 's/\r//' /start-celerybeat.sh
|
RUN sed -i 's/\r//' /start-celerybeat
|
||||||
RUN chmod +x /start-celerybeat.sh
|
RUN chmod +x /start-celerybeat
|
||||||
{% endif %}
|
{% endif %}
|
||||||
COPY . /app
|
COPY . /app
|
||||||
|
|
||||||
|
@ -45,4 +45,4 @@ USER django
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint"]
|
||||||
|
|
|
@ -22,7 +22,7 @@ services:
|
||||||
- ./.envs/.local/.postgres
|
- ./.envs/.local/.postgres
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
command: /start.sh
|
command: /start
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
build:
|
build:
|
||||||
|
@ -60,7 +60,7 @@ services:
|
||||||
- ./.envs/.local/.django
|
- ./.envs/.local/.django
|
||||||
- ./.envs/.local/.postgres
|
- ./.envs/.local/.postgres
|
||||||
ports: []
|
ports: []
|
||||||
command: /start-celeryworker.sh
|
command: /start-celeryworker
|
||||||
|
|
||||||
celerybeat:
|
celerybeat:
|
||||||
<<: *django
|
<<: *django
|
||||||
|
@ -75,6 +75,6 @@ services:
|
||||||
- ./.envs/.local/.django
|
- ./.envs/.local/.django
|
||||||
- ./.envs/.local/.postgres
|
- ./.envs/.local/.postgres
|
||||||
ports: []
|
ports: []
|
||||||
command: /start-celerybeat.sh
|
command: /start-celerybeat
|
||||||
|
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
|
@ -17,7 +17,7 @@ services:
|
||||||
env_file:
|
env_file:
|
||||||
- ./.envs/.production/.django
|
- ./.envs/.production/.django
|
||||||
- ./.envs/.production/.postgres
|
- ./.envs/.production/.postgres
|
||||||
command: /gunicorn.sh
|
command: /gunicorn
|
||||||
|
|
||||||
postgres:
|
postgres:
|
||||||
build:
|
build:
|
||||||
|
@ -58,7 +58,7 @@ services:
|
||||||
env_file:
|
env_file:
|
||||||
- ./.envs/.production/.django
|
- ./.envs/.production/.django
|
||||||
- ./.envs/.production/.postgres
|
- ./.envs/.production/.postgres
|
||||||
command: /start-celeryworker.sh
|
command: /start-celeryworker
|
||||||
|
|
||||||
celerybeat:
|
celerybeat:
|
||||||
<<: *django
|
<<: *django
|
||||||
|
@ -69,6 +69,6 @@ services:
|
||||||
env_file:
|
env_file:
|
||||||
- ./.envs/.production/.django
|
- ./.envs/.production/.django
|
||||||
- ./.envs/.production/.postgres
|
- ./.envs/.production/.postgres
|
||||||
command: /start-celerybeat.sh
|
command: /start-celerybeat
|
||||||
|
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user