mirror of
				https://github.com/cookiecutter/cookiecutter-django.git
				synced 2025-11-04 09:57:30 +03:00 
			
		
		
		
	Merge branch 'master' of https://github.com/pydanny/cookiecutter-django
This commit is contained in:
		
						commit
						2ffdffe9c7
					
				| 
						 | 
					@ -6,16 +6,16 @@ FROM python:2.7
 | 
				
			||||||
ENV PYTHONUNBUFFERED 1
 | 
					ENV PYTHONUNBUFFERED 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Requirements have to be pulled and installed here, otherwise caching won't work
 | 
					# Requirements have to be pulled and installed here, otherwise caching won't work
 | 
				
			||||||
ADD ./requirements /requirements
 | 
					COPY ./requirements /requirements
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN pip install -r /requirements/production.txt
 | 
					RUN pip install -r /requirements/production.txt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN groupadd -r django && useradd -r -g django django
 | 
					RUN groupadd -r django && useradd -r -g django django
 | 
				
			||||||
ADD . /app
 | 
					COPY . /app
 | 
				
			||||||
RUN chown -R django /app
 | 
					RUN chown -R django /app
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ADD ./compose/django/gunicorn.sh /gunicorn.sh
 | 
					COPY ./compose/django/gunicorn.sh /gunicorn.sh
 | 
				
			||||||
ADD ./compose/django/entrypoint.sh /entrypoint.sh
 | 
					COPY ./compose/django/entrypoint.sh /entrypoint.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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -6,16 +6,16 @@ FROM python:2.7
 | 
				
			||||||
ENV PYTHONUNBUFFERED 1
 | 
					ENV PYTHONUNBUFFERED 1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Requirements have to be pulled and installed here, otherwise caching won't work
 | 
					# Requirements have to be pulled and installed here, otherwise caching won't work
 | 
				
			||||||
ADD ./requirements /requirements
 | 
					COPY ./requirements /requirements
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN pip install -r /requirements/local.txt
 | 
					RUN pip install -r /requirements/local.txt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RUN groupadd -r django && useradd -r -g django django
 | 
					RUN groupadd -r django && useradd -r -g django django
 | 
				
			||||||
ADD . /app
 | 
					COPY . /app
 | 
				
			||||||
RUN chown -R django /app
 | 
					RUN chown -R django /app
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ADD ./compose/django/gunicorn.sh /gunicorn.sh
 | 
					COPY ./compose/django/gunicorn.sh /gunicorn.sh
 | 
				
			||||||
ADD ./compose/django/entrypoint.sh /entrypoint.sh
 | 
					COPY ./compose/django/entrypoint.sh /entrypoint.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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user