Restructure to user s6-overlay properly
This commit is contained in:
		@@ -80,7 +80,7 @@ ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.s
 | 
				
			|||||||
ADD https://bitbucket.org/Gethec/projecttools/raw/master/DockerUtilities/ContainerTools /usr/bin/ContainerTools
 | 
					ADD https://bitbucket.org/Gethec/projecttools/raw/master/DockerUtilities/ContainerTools /usr/bin/ContainerTools
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Install S6-Overlay and Wait-For-It
 | 
					# Install S6-Overlay and Wait-For-It
 | 
				
			||||||
RUN chmod u+x /usr/local/bin/wait-for-it /etc/cont-init.d/initializer && \
 | 
					RUN chmod u+x /usr/local/bin/wait-for-it /etc/s6-overlay/scripts/initializer && \
 | 
				
			||||||
    tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz && \
 | 
					    tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz && \
 | 
				
			||||||
    tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \
 | 
					    tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \
 | 
				
			||||||
    # Remove preinstalled conf files
 | 
					    # Remove preinstalled conf files
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/crond/dependencies
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/crond/dependencies
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					initialize
 | 
				
			||||||
							
								
								
									
										3
									
								
								root/etc/s6-overlay/s6-rc.d/crond/run
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								root/etc/s6-overlay/s6-rc.d/crond/run
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					#!/command/with-contenv bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/usr/sbin/crond -fL /dev/null
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/crond/type
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/crond/type
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					longrun
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/initialize/type
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/initialize/type
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					oneshot
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/initialize/up
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/initialize/up
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					/etc/s6-overlay/scripts/initializer
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/nginx/dependencies
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/nginx/dependencies
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					initialize
 | 
				
			||||||
@@ -1,2 +1,3 @@
 | 
				
			|||||||
#!/command/execlineb -P
 | 
					#!/command/with-contenv bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/usr/sbin/nginx -g "daemon off;"
 | 
					/usr/sbin/nginx -g "daemon off;"
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/nginx/type
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/nginx/type
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					longrun
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/php-fpm/dependencies
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/php-fpm/dependencies
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					initialize
 | 
				
			||||||
@@ -1,2 +1,3 @@
 | 
				
			|||||||
#!/command/execlineb -P
 | 
					#!/command/with-contenv bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/usr/sbin/php-fpm -Fc /etc/php
 | 
					/usr/sbin/php-fpm -Fc /etc/php
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/php-fpm/type
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/php-fpm/type
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					longrun
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/pteroq/dependencies
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/pteroq/dependencies
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					initialize
 | 
				
			||||||
@@ -1,3 +1,4 @@
 | 
				
			|||||||
#!/command/execlineb -P
 | 
					#!/command/with-contenv bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
s6-setuidgid nginx
 | 
					s6-setuidgid nginx
 | 
				
			||||||
/usr/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
 | 
					/usr/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
 | 
				
			||||||
							
								
								
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/pteroq/type
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								root/etc/s6-overlay/s6-rc.d/pteroq/type
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					longrun
 | 
				
			||||||
							
								
								
									
										0
									
								
								root/etc/s6-overlay/s6-rc.d/user/contents.d/crond
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								root/etc/s6-overlay/s6-rc.d/user/contents.d/crond
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								root/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								root/etc/s6-overlay/s6-rc.d/user/contents.d/nginx
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								root/etc/s6-overlay/s6-rc.d/user/contents.d/php-fpm
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								root/etc/s6-overlay/s6-rc.d/user/contents.d/php-fpm
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								root/etc/s6-overlay/s6-rc.d/user/contents.d/pteroq
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								root/etc/s6-overlay/s6-rc.d/user/contents.d/pteroq
									
									
									
									
									
										Normal file
									
								
							@@ -1,2 +0,0 @@
 | 
				
			|||||||
#!/command/execlineb -P
 | 
					 | 
				
			||||||
/usr/sbin/crond -fL /dev/null
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user