feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								a65fc78c6a
								
							
						 | 
						
							
							
								
								Merge branch 'libmagic' into 'develop'
							
							
							
							
							
							
							
							Add missing libmagic for image upload to dockerfile
See merge request pleroma/pleroma!3168 
							
						 | 
						
							2020-11-21 18:11:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Guy Sheffer
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6af7dc777
								
							
						 | 
						
							
							
								
								Add missing libmagic for image upload
							
							
							
							
							
						 | 
						
							2020-11-21 19:57:38 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								42ff5ea95e
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !2955 
							
						 | 
						
							2020-11-18 20:32:30 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Walker
								
							 
						 | 
						
							
							
							
							
								
							
							
								c09813193a
								
							
						 | 
						
							
							
								
								Install file-dev in Dockerfile build stage
							
							
							
							
							
							
							
							This is required by the majic, added in #2534. 
							
						 | 
						
							2020-11-12 22:20:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James Alseth
								
							 
						 | 
						
							
							
							
							
								
							
							
								9fd0e5e0dd
								
							
						 | 
						
							
							
								
								Use TLS when adding Alpine community repository in Dockerfile
							
							
							
							
							
						 | 
						
							2020-09-04 19:19:56 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								a47406d577
								
							
						 | 
						
							
							
								
								Build files: Add cmake
							
							
							
							
							
						 | 
						
							2020-08-13 14:12:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								6167593881
								
							
						 | 
						
							
							
								
								Support Exiftool for stripping EXIF data
							
							
							
							
							
							
							
							We really only want to strip location data anyway, and mogrify strips color profiles. 
							
						 | 
						
							2020-07-10 16:46:26 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kPherox
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0e8f6d24b8
								
							
						 | 
						
							
							
								
								Create OTP_VERSION file by mix release
							
							
							
							
							
						 | 
						
							2020-04-10 00:22:50 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kPherox
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d37a102933
								
							
						 | 
						
							
							
								
								Fix OTP_VERSION file in docker
							
							
							
							
							
						 | 
						
							2020-04-09 21:16:29 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									jp
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2715ed772
								
							
						 | 
						
							
							
								
								add imagemagick and update inherited container to alpine:3.11
							
							
							
							
							
						 | 
						
							2020-03-31 21:31:23 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6dc33615b
								
							
						 | 
						
							
							
								
								Add imagemagick to Docker image to fix broken mogrify plugin
							
							
							
							
							
						 | 
						
							2020-03-31 14:29:43 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									jp
								
							 
						 | 
						
							
							
							
							
								
							
							
								2ef8f0be6c
								
							
						 | 
						
							
							
								
								Update Dockerfile with labels. Update gitlab-ci for registry usage
							
							
							
							
							
						 | 
						
							2020-01-10 14:09:14 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ashlynn Anderson
								
							 
						 | 
						
							
							
							
							
								
							
							
								053b17f57e
								
							
						 | 
						
							
							
								
								Switch to alpine:3.9 to avoid dlsym errors
							
							
							
							
							
						 | 
						
							2019-09-04 14:56:26 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ashlynn Anderson
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b422b5469
								
							
						 | 
						
							
							
								
								Switch to official elixir:1.9-alpine image for build
							
							
							
							
							
						 | 
						
							2019-09-03 11:44:57 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ashlynn Anderson
								
							 
						 | 
						
							
							
							
							
								
							
							
								c86db959cb
								
							
						 | 
						
							
							
								
								Optimize Dockerfile
							
							
							
							
							
							
							
							Just merging RUNs to decrease the number of layers 
							
						 | 
						
							2019-08-03 00:21:54 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ashlynn Anderson
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a418698db
								
							
						 | 
						
							
							
								
								Create docker.exs and docker-entrypoint + round out Dockerfile
							
							
							
							
							
							
							
							At this point, the implementation is completely working and has been
tested running live and federating with other instances. 
							
						 | 
						
							2019-08-03 00:21:54 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ashlynn Anderson
								
							 
						 | 
						
							
							
							
							
								
							
							
								7efca4317b
								
							
						 | 
						
							
							
								
								Basic working Dockerfile
							
							
							
							
							
							
							
							No fancy script or minit automatic migration, etc, but if you start
the docker image and go in and manually do everything, it works. 
							
						 | 
						
							2019-08-03 00:21:54 -04:00 | 
						
						
							
							
							
								
							
							
						 |