mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Fix issue with docker-rootless shimming script (#18690)
This commit is contained in:
		@@ -33,10 +33,8 @@ for i in "$@"; do
 | 
				
			|||||||
done
 | 
					done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -z "$APP_INI_SET" ]; then
 | 
					if [ -z "$APP_INI_SET" ]; then
 | 
				
			||||||
	CONF_ARG="-c \"$APP_INI\""
 | 
						CONF_ARG=("-c" "${GITEA_APP_INI:-$APP_INI}")
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Provide FHS compliant defaults
 | 
					# Provide FHS compliant defaults
 | 
				
			||||||
GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" $CONF_ARG "$@"
 | 
					GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" "${CONF_ARG[@]}"  "$@"
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -32,11 +32,9 @@ for i in "$@"; do
 | 
				
			|||||||
done
 | 
					done
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -z "$APP_INI_SET" ]; then
 | 
					if [ -z "$APP_INI_SET" ]; then
 | 
				
			||||||
	CONF_ARG="-c \"${GITEA_APP_INI:-$APP_INI}\""
 | 
						CONF_ARG=("-c" "${GITEA_APP_INI:-$APP_INI}")
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Provide docker defaults
 | 
					# Provide docker defaults
 | 
				
			||||||
GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" $CONF_ARG "$@"
 | 
					GITEA_WORK_DIR="${GITEA_WORK_DIR:-$WORK_DIR}" exec -a "$0" "$GITEA" "${CONF_ARG[@]}" "$@"
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user