Merge pull request 'make-docker-build-succesful' (#19) from make-docker-build-succesful into master
Reviewed-on: #19
This commit is contained in:
		
				commit
				
					
						dee2b1a90c
					
				
			
		
					 3 changed files with 14 additions and 3 deletions
				
			
		| 
						 | 
					@ -1 +1,2 @@
 | 
				
			||||||
.git
 | 
					.git
 | 
				
			||||||
 | 
					.env
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										14
									
								
								Dockerfile
									
										
									
									
									
								
							
							
						
						
									
										14
									
								
								Dockerfile
									
										
									
									
									
								
							| 
						 | 
					@ -8,12 +8,22 @@ RUN apk add --update --no-cache \
 | 
				
			||||||
    build-base \
 | 
					    build-base \
 | 
				
			||||||
    openldap-dev \
 | 
					    openldap-dev \
 | 
				
			||||||
    python3-dev \
 | 
					    python3-dev \
 | 
				
			||||||
    libpq-dev \
 | 
					    postgresql-dev \
 | 
				
			||||||
 | 
					    jpeg-dev \
 | 
				
			||||||
 | 
					    libxml2-dev \
 | 
				
			||||||
 | 
					    libxslt-dev \
 | 
				
			||||||
 | 
					    libmemcached-dev \
 | 
				
			||||||
 | 
					    zlib-dev \
 | 
				
			||||||
    && rm -rf /var/cache/apk/*
 | 
					    && rm -rf /var/cache/apk/*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## For alpine 3.15 replace postgresql-dev with libpq-dev
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# FIX https://github.com/python-ldap/python-ldap/issues/432
 | 
					# FIX https://github.com/python-ldap/python-ldap/issues/432
 | 
				
			||||||
RUN echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so
 | 
					RUN echo 'INPUT ( libldap.so )' > /usr/lib/libldap_r.so
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY requirements.txt ./
 | 
					COPY requirements.txt ./
 | 
				
			||||||
RUN pip install --no-cache-dir -r requirements.txt
 | 
					
 | 
				
			||||||
 | 
					# Pillow seems to need LIBRARY_PATH set as follows:  (see: https://github.com/python-pillow/Pillow/issues/1763#issuecomment-222383534)
 | 
				
			||||||
 | 
					RUN LIBRARY_PATH=/lib:/usr/lib /bin/sh -c "pip install --no-cache-dir -r requirements.txt"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
COPY ./ .
 | 
					COPY ./ .
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,7 @@ django-compressor==2.0
 | 
				
			||||||
django-debug-toolbar==1.4
 | 
					django-debug-toolbar==1.4
 | 
				
			||||||
python-dotenv==0.10.3
 | 
					python-dotenv==0.10.3
 | 
				
			||||||
django-extensions==1.6.7
 | 
					django-extensions==1.6.7
 | 
				
			||||||
django-filer==2.1.2
 | 
					django-filer==1.2.0
 | 
				
			||||||
django-filter==0.13.0
 | 
					django-filter==0.13.0
 | 
				
			||||||
django-formtools==1.0
 | 
					django-formtools==1.0
 | 
				
			||||||
django-guardian==1.4.4
 | 
					django-guardian==1.4.4
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue