new gd compile, fix project_setup override
	
		
			
	
		
	
	
		
	
		
			Some checks reported errors
		
		
	
	
		
			
				
	
				continuous-integration/drone/push Build encountered an error
				
			
		
		
	
	
				
					
				
			
		
			Some checks reported errors
		
		
	
	continuous-integration/drone/push Build encountered an error
				
			This commit is contained in:
		| @@ -1,7 +1,7 @@ | ||||
| #!/bin/bash | ||||
|  | ||||
| PHP_VERSION=`php -r 'echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;'` | ||||
| PHP_MODULES=("calendar" "bcmath" "bz2" "curl" "fileinfo" "gd" "gettext" "iconv" "imap" "intl" "ldap" "mbstring" "opcache" "pcntl" "pdo" "pdo_mysql" "pdo_pgsql" "pdo_sqlite" "pgsql" "phar" "session" "simplexml" "soap" "xml", "zip") | ||||
| PHP_MODULES=("calendar" "bcmath" "bz2" "curl" "fileinfo" "gettext" "iconv" "imap" "intl" "ldap" "mbstring" "opcache" "pcntl" "pdo" "pdo_mysql" "pdo_pgsql" "pdo_sqlite" "pgsql" "phar" "session" "simplexml" "soap" "xml", "zip") | ||||
|  | ||||
| # | ||||
| # Helper functions | ||||
| @@ -26,25 +26,26 @@ h2() { | ||||
| h1 "Configure PHP modules" | ||||
| case $PHP_VERSION in | ||||
|     '80' ) | ||||
| 		h2 "[php8] Configure GD" | ||||
| 		docker-php-ext-configure gd \ | ||||
| 	         --with-freetype \ | ||||
| 	         --with-jpeg \ | ||||
| 	         --with-webp | ||||
| 		h2 "[php8] Configure and install GD" | ||||
| 		docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --enable-gd  | ||||
|     	docker-php-ext-install -j$(nproc) gd | ||||
|  | ||||
|     ;; | ||||
|     '74' ) | ||||
| 		h2 "[php74] Configure GD" | ||||
|     	docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp | ||||
| 		h2 "[php74] Configure and install GD" | ||||
|     	docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp | ||||
|     	docker-php-ext-install -j$(nproc) gd | ||||
| 		h2 "Install json module" | ||||
|     	docker-php-ext-install -j$(nproc) json | ||||
|     ;; | ||||
|     * ) | ||||
| 		h2 "Configure GD" | ||||
| 		h2 "Configure and install GD" | ||||
| 		docker-php-ext-configure gd \ | ||||
| 	         --with-freetype-dir=/usr/lib/ \ | ||||
| 	         --with-png-dir=/usr/lib/ \ | ||||
| 	         --with-jpeg-dir=/usr/lib/ \ | ||||
| 	         --with-gd | ||||
| 	    docker-php-ext-install -j$(nproc) gd | ||||
| 		h2 "Install json module" | ||||
|     	docker-php-ext-install -j$(nproc) json | ||||
|     break | ||||
|   | ||||
| @@ -1,5 +1,6 @@ | ||||
| #!/bin/sh | ||||
|  | ||||
| if [ -f /var/www/override.ini && -f  /usr/local/etc/php/conf.d/02-project-override.ini ]; then | ||||
| if [ -f /var/www/override.ini ]; then | ||||
| 	rm /usr/local/etc/php/conf.d/02-project-override.ini  | ||||
| 	ln -s /var/www/override.ini /usr/local/etc/php/conf.d/02-project-override.ini | ||||
| fi | ||||
|   | ||||
		Reference in New Issue
	
	Block a user