mirror of
				https://github.com/nextcloud/docker.git
				synced 2025-10-31 00:11:40 +01:00 
			
		
		
		
	Merge pull request #279 from nextcloud/var-php-version
Use var for the php version
This commit is contained in:
		
						commit
						cf450e5d14
					
				| @ -1,4 +1,4 @@ | |||||||
| FROM php:7.1-%%VARIANT%% | FROM php:%%PHP_VERSION%%-%%VARIANT%% | ||||||
| 
 | 
 | ||||||
| # entrypoint.sh and cron.sh dependencies | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| FROM php:7.1-%%VARIANT%% | FROM php:%%PHP_VERSION%%-%%VARIANT%% | ||||||
| 
 | 
 | ||||||
| # entrypoint.sh and cron.sh dependencies | # entrypoint.sh and cron.sh dependencies | ||||||
| RUN set -ex; \ | RUN set -ex; \ | ||||||
|  | |||||||
| @ -1,6 +1,10 @@ | |||||||
| #!/bin/bash | #!/bin/bash | ||||||
| set -eo pipefail | set -eo pipefail | ||||||
| 
 | 
 | ||||||
|  | declare -A php_version=( | ||||||
|  | 	[default]='7.1' | ||||||
|  | ) | ||||||
|  | 
 | ||||||
| declare -A cmd=( | declare -A cmd=( | ||||||
| 	[apache]='apache2-foreground' | 	[apache]='apache2-foreground' | ||||||
| 	[fpm]='php-fpm' | 	[fpm]='php-fpm' | ||||||
| @ -59,6 +63,7 @@ for latest in "${latests[@]}"; do | |||||||
| 
 | 
 | ||||||
| 			# Replace the variables. | 			# Replace the variables. | ||||||
| 			sed -ri -e ' | 			sed -ri -e ' | ||||||
|  | 				s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g; | ||||||
| 				s/%%VARIANT%%/'"$variant"'/g; | 				s/%%VARIANT%%/'"$variant"'/g; | ||||||
| 				s/%%VERSION%%/'"$latest"'/g; | 				s/%%VERSION%%/'"$latest"'/g; | ||||||
| 				s/%%CMD%%/'"${cmd[$variant]}"'/g; | 				s/%%CMD%%/'"${cmd[$variant]}"'/g; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user