Martin Rys 
							
						 
					 
					
						
						
							
						
						70479df5dc 
					 
					
						
						
							
							Dockerfile: Don't cache 50MB of lists and use a single layer, make it pretty  
						
						
						
						
					 
					
						2024-03-12 14:04:33 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						7e04f70bf3 
					 
					
						
						
							
							Tweaked docker dev container to work with m1 apple silicon  
						
						... 
						
						
						
						Tested on m1 macbook, needs testing on amd64 
						
						
					 
					
						2022-07-14 01:34:57 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						e33b587b87 
					 
					
						
						
							
							Updated minimum php version from 7.3 to 7.4  
						
						... 
						
						
						
						Closes  #3152  
					
						2022-02-04 13:27:11 +00:00 
						 
				 
			
				
					
						
							
							
								julesdevops 
							
						 
					 
					
						
						
							
						
						a2a2f3a4dd 
					 
					
						
						
							
							chore(dev): add xdebug support for docker setup  
						
						
						
						
					 
					
						2022-01-22 17:43:29 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						9af636bd48 
					 
					
						
						
							
							Merge branch 'markdown-export' of  https://github.com/nikhiljha/BookStack-1  into nikhiljha-markdown-export  
						
						
						
						
					 
					
						2021-06-22 19:12:24 +01:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						43c2fc3c37 
					 
					
						
						
							
							Updated dev-docker setup to not alter phpunit.xml  
						
						... 
						
						
						
						Tested on my machine via fresh dev instance with tests passing.
May need old users to drop their old volume data. 
						
						
					 
					
						2021-03-21 17:42:10 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						371033a0f2 
					 
					
						
						
							
							Merge branch 'master' into docker-tests  
						
						
						
						
					 
					
						2021-03-21 16:49:22 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						c548c06086 
					 
					
						
						
							
							Updated dev-docker setup  
						
						... 
						
						
						
						Removed extension installs for already installed things.
Removed tidy build bits.
Ensured it ran via quick build and test 
						
						
					 
					
						2021-03-20 16:44:47 +00:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						829fecd338 
					 
					
						
						
							
							Updated app to PHP7.3 min supported version, For php8 support  
						
						... 
						
						
						
						- Updated remaining dependancies
- Upped min versions used
- Updated GH actions to drop 7.2 and include 8.0
- Updated phpunit & tests to 9.x 
						
						
					 
					
						2021-03-20 15:35:39 +00:00 
						 
				 
			
				
					
						
							
							
								Abijeet 
							
						 
					 
					
						
						
							
						
						a0c605faae 
					 
					
						
						
							
							Docker: Fix PHP tests  
						
						... 
						
						
						
						This creates another mysql_testing database during db service setup
Replace server with env tags in phpunit.xml in order to force
override certain parameters when tests are run. See:
https://github.com/sebastianbergmann/phpunit/issues/2353  for more
information.
Rename primary developer Docker database from bookstack-test to
bookstack-dev. bookstack-test is used as the mysql_testing database 
						
						
					 
					
						2021-01-31 18:54:24 +05:30 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						78be644332 
					 
					
						
						
							
							Merge pull request  #2298  from timoschwarzer/composer-install-in-entrypoint  
						
						... 
						
						
						
						Install composer dependencies in Docker entrypoint 
						
						
					 
					
						2020-10-31 21:56:48 +00:00 
						 
				 
			
				
					
						
							
							
								Timo Schwarzer 
							
						 
					 
					
						
						
							
						
						a74d551bd6 
					 
					
						
						
							
							Install composer dependencies in Docker entrypoint  
						
						
						
						
					 
					
						2020-10-01 11:34:56 +02:00 
						 
				 
			
				
					
						
							
							
								Timo Schwarzer 
							
						 
					 
					
						
						
							
						
						aca37b8784 
					 
					
						
						
							
							Fix build:js:watch not building at first launch in Docker  
						
						
						
						
					 
					
						2020-10-01 11:25:22 +02:00 
						 
				 
			
				
					
						
							
							
								Nikhil Jha 
							
						 
					 
					
						
						
							
						
						ea82c2f61b 
					 
					
						
						
							
							support exporting books as zip files  
						
						
						
						
					 
					
						2020-05-13 19:57:59 -07:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						ccec991f6c 
					 
					
						
						
							
							Added zip/unzip to docker dev setup for composer to use  
						
						
						
						
					 
					
						2019-10-05 13:21:38 +01:00 
						 
				 
			
				
					
						
							
							
								Ammar Al-Khawaldeh 
							
						 
					 
					
						
						
							
						
						3f025f69cf 
					 
					
						
						
							
							Add git to the apt-get install packages.  
						
						
						
						
					 
					
						2019-10-03 20:46:49 +03:00 
						 
				 
			
				
					
						
							
							
								Dan Brown 
							
						 
					 
					
						
						
							
						
						21f09a5920 
					 
					
						
						
							
							Added ldap and moved compose for docker-dev setup  
						
						... 
						
						
						
						- Also tweaked readme a little to fit this is with more recent changes. 
						
						
					 
					
						2019-08-26 22:01:10 +01:00 
						 
				 
			
				
					
						
							
							
								Timo Schwarzer 
							
						 
					 
					
						
						
							
						
						c6b1f36412 
					 
					
						
						
							
							Alter docker paths  
						
						
						
						
					 
					
						2019-08-12 22:19:58 +02:00