forked from ungleich-public/cdist
		
	[__pyvenv] use python3 -m venv on alpine
Until python4 comes, this will work
This commit is contained in:
		
					parent
					
						
							
								0f639a9278
							
						
					
				
			
			
				commit
				
					
						d034fe9369
					
				
			
		
					 2 changed files with 12 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -37,11 +37,21 @@ mode="$(cat "$__object/parameter/mode")"
 | 
			
		|||
destination="/$__object_id"
 | 
			
		||||
venvparams="$(cat "$__object/parameter/venvparams")"
 | 
			
		||||
pyvenvparam="$__object/parameter/pyvenv"
 | 
			
		||||
 | 
			
		||||
os=$(cat $__global/explorer/os)
 | 
			
		||||
 | 
			
		||||
if [ -f "$pyvenvparam" ]
 | 
			
		||||
then
 | 
			
		||||
    pyvenv=$(cat "$pyvenvparam")
 | 
			
		||||
else
 | 
			
		||||
    case "$os" in
 | 
			
		||||
        alpine) # no pyvenv on alpine - I assume others will follow
 | 
			
		||||
            pyvenv="python3 -m venv"
 | 
			
		||||
            ;;
 | 
			
		||||
        *)
 | 
			
		||||
            pyvenv="pyvenv"
 | 
			
		||||
            ;;
 | 
			
		||||
    esac
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
case $state_should in
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,6 +3,7 @@ Changelog
 | 
			
		|||
 | 
			
		||||
next:
 | 
			
		||||
	* Type __cron: Make non parallel due to race condition (Nico Schottelius)
 | 
			
		||||
	* Type __pyvenv: Use python3 -m venv on Alpine (Nico Schottelius)
 | 
			
		||||
	* Type __user: Fix missing shadow for alpine (llnu)
 | 
			
		||||
	* Type __consule_agent: Make conf_dir dependent on OS - fixes Alpine (Nico Schottelius)
 | 
			
		||||
	* Type __letsencrypt_cert: Fix typo (Andrew Schleifer)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue