Attachment #10038 for bug #49517

View | Details | Raw Unified | Return to bug 49517
Collapse All | Expand All




		return

	def pull(self):
		self._setup_yml(recreate=True)
		yml_file = self.app.get_compose_file('docker-compose.yml')
		shutil.copy2(self.app.get_cache_file('compose'), yml_file)
		os.chmod(yml_file, 0600)
		self.logger.info('Downloading app images')
		ret, out = call_process2(['docker-compose', '-p', self.app.id, 'pull'], cwd=self.app.get_compose_dir(), logger=_logger)
		if ret != 0:

		template_file = '%s.template' % yml_file
		mkdir(self.app.get_compose_dir())
		shutil.copy2(self.app.get_cache_file('compose'), template_file)
		os.chmod(yml_file, 0600)
		with open(template_file) as fd:
			template = fd.read()
			content = ucr_run_filter(template)
		with open(yml_file, 'wb') as fd:
			os.chmod(yml_file, 0600)
			fd.write(content)
		content = yaml.load(open(yml_file), yaml.RoundTripLoader, preserve_quotes=True)
		container_def = content['services'][self.app.docker_main_service]

Return to bug 49517

Lines 389-398 class MultiDocker(Docker): Link Here

(-)a/management/univention-appcenter/python/appcenter-docker/docker.py (-5 / +2 lines)
389	return	389	return
390		390
391	def pull(self):	391	def pull(self):
392	mkdir(self.app.get_compose_dir())	392	self._setup_yml(recreate=True)
393	yml_file = self.app.get_compose_file('docker-compose.yml')
394	shutil.copy2(self.app.get_cache_file('compose'), yml_file)
395	os.chmod(yml_file, 0600)
396	self.logger.info('Downloading app images')	393	self.logger.info('Downloading app images')
397	ret, out = call_process2(['docker-compose', '-p', self.app.id, 'pull'], cwd=self.app.get_compose_dir(), logger=_logger)	394	ret, out = call_process2(['docker-compose', '-p', self.app.id, 'pull'], cwd=self.app.get_compose_dir(), logger=_logger)
398	if ret != 0:	395	if ret != 0:
Lines 422-432 class MultiDocker(Docker): Link Here
422	template_file = '%s.template' % yml_file	419	template_file = '%s.template' % yml_file
423	mkdir(self.app.get_compose_dir())	420	mkdir(self.app.get_compose_dir())
424	shutil.copy2(self.app.get_cache_file('compose'), template_file)	421	shutil.copy2(self.app.get_cache_file('compose'), template_file)
425	os.chmod(yml_file, 0600)
426	with open(template_file) as fd:	422	with open(template_file) as fd:
427	template = fd.read()	423	template = fd.read()
428	content = ucr_run_filter(template)	424	content = ucr_run_filter(template)
429	with open(yml_file, 'wb') as fd:	425	with open(yml_file, 'wb') as fd:
		426	os.chmod(yml_file, 0600)
430	fd.write(content)	427	fd.write(content)
431	content = yaml.load(open(yml_file), yaml.RoundTripLoader, preserve_quotes=True)	428	content = yaml.load(open(yml_file), yaml.RoundTripLoader, preserve_quotes=True)
432	container_def = content['services'][self.app.docker_main_service]	429	container_def = content['services'][self.app.docker_main_service]

Lines 50-56 from univention.appcenter.log import get_base_logger Link Here

(-)a/management/univention-appcenter/python/appcenter/app.py (-2 / +2 lines)
50	from univention.appcenter.packages import get_package_manager, packages_are_installed, reload_package_manager	50	from univention.appcenter.packages import get_package_manager, packages_are_installed, reload_package_manager
51	from univention.appcenter.meta import UniventionMetaClass, UniventionMetaInfo	51	from univention.appcenter.meta import UniventionMetaClass, UniventionMetaInfo
52	from univention.appcenter.utils import app_ports, mkdir, get_current_ram_available, get_locale, container_mode, _	52	from univention.appcenter.utils import app_ports, mkdir, get_current_ram_available, get_locale, container_mode, _
53	from univention.appcenter.ucr import ucr_get, ucr_includes, ucr_is_true, ucr_load	53	from univention.appcenter.ucr import ucr_get, ucr_includes, ucr_is_true, ucr_load, ucr_run_filter
54	from univention.appcenter.settings import Setting	54	from univention.appcenter.settings import Setting
55	from univention.appcenter.ini_parser import read_ini_file	55	from univention.appcenter.ini_parser import read_ini_file
56		56
Lines 986-992 class App(object): Link Here
986	# appcenter-docker is not installed	986	# appcenter-docker is not installed
987	return None	987	return None
988	yml_file = self.get_cache_file('compose')	988	yml_file = self.get_cache_file('compose')
989	content = yaml.load(open(yml_file), yaml.RoundTripLoader, preserve_quotes=True)	989	content = yaml.load(ucr_run_filter(open(yml_file).read()), yaml.RoundTripLoader, preserve_quotes=True)
990	image = content['services'][self.docker_main_service]['image']	990	image = content['services'][self.docker_main_service]['image']
991	return image	991	return image
992	else:	992	else: