Merge branch 'win-docker'

This commit is contained in:
Burhan Khalid 2016-01-08 12:59:39 +03:00
commit a24664b5a4
2 changed files with 3 additions and 1 deletions

View File

@ -16,7 +16,8 @@ RUN chown -R django /app
COPY ./compose/django/gunicorn.sh /gunicorn.sh COPY ./compose/django/gunicorn.sh /gunicorn.sh
COPY ./compose/django/entrypoint.sh /entrypoint.sh COPY ./compose/django/entrypoint.sh /entrypoint.sh
RUN sed -i 's/\r//' /entrypoint.sh
RUN set -i 's/\r//' /guincorn.sh
RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh RUN chmod +x /entrypoint.sh && chown django /entrypoint.sh
RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh

View File

@ -10,6 +10,7 @@ COPY ./requirements /requirements
RUN pip install -r /requirements/local.txt RUN pip install -r /requirements/local.txt
COPY ./compose/django/entrypoint.sh /entrypoint.sh COPY ./compose/django/entrypoint.sh /entrypoint.sh
RUN sed -i 's/\r//' /entrypoint.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh
WORKDIR /app WORKDIR /app