PR#3024: Improve docker-compose and documentation - pagure

pagure

#3024 Improve docker-compose and documentation

Merged 6 years ago by pingou. Opened 6 years ago by farhaan.

farhaan/pagure improve-compose into master

Replace print with debug logs

Farhaan Bukhsh • 6 years ago

54719fe

Improve docker-compose and documentation

Farhaan Bukhsh • 6 years ago

a2549f3

README.rst

file modified

		`@@ -57,6 +57,10 @@`

		`Docker Compose`
		`^^^^^^^^^^^^^^`
		`+ Create the folder that will receive the projects, forks, docs, requests and`
		`+ tickets' git repo::`
		`+`
		`+ mkdir -p lcl/{repos,remotes,attachments,releases}`

		`A docker compose environment is available to run pagure. First use the following`
		`command to build the containers. ::`

dev/docker-compose.yml

file modified

+4 -16

		`@@ -13,14 +13,8 @@`
		`ports:`
		`- "5000:5000"`
		`volumes:`
		`- - type: volume`
		`- source: ../lcl/repos`
		`- target: /repos`
		`- read_only: false`
		`- - type: volume`
		`- source: ../lcl/attachments`
		`- target: /attachments`
		`- read_only: false`
		`+ - ../lcl/repos:/repos`
		`+ - ../lcl/attachments:/attachments`
		`- ..:/code:z`
		`worker:`
		`build:`
		`@@ -31,14 +25,8 @@`
		`- postgresql`
		`image: pagure-worker:latest`
		`volumes:`
		`- - type: volume`
		`- source: ../lcl/repos`
		`- target: /repos`
		`- read_only: false`
		`- - type: volume`
		`- source: ../lcl/attachments`
		`- target: /attachments`
		`- read_only: true`
		`+ - ../lcl/repos:/repos`
		`+ - ../lcl/attachments:/attachments:ro`
		`- ..:/code:z`
		`environment:`
		`- PYTHONPATH=.`

pagure/lib/notify.py

file modified

+11 -11

		`@@ -289,17 +289,17 @@`
		`pagure_config['DOMAIN_EMAIL_NOTIFICATIONS'])`
		`msg['Mail-Followup-To'] = msg['Reply-To']`
		`if not pagure_config.get('EMAIL_SEND', True):`
		`- print('****EMAIL****')`
cverna commented 6 years ago @pingou any reason we used print statement here ?
pingou commented 6 years ago I'm wondering if this isn't from time where we were using much less logging
		`- print('From: %s' % from_email)`
		`- print('To: %s' % to_mail)`
		`- print('Subject: %s' % subject)`
		`- print('in_reply_to: %s' % in_reply_to)`
		`- print('mail_id: %s' % mail_id)`
		`- print('Contents:')`
		`- print(text.encode('utf-8'))`
		`- print('*****************')`
		`- print(msg.as_string())`
		`- print('***/EMAIL****')`
		`+ _log.debug('****EMAIL****')`
pingou commented 6 years ago This isn't quite related to docker :)
cverna commented 6 years ago in a way yes because it is not easy to get stdout using docker-compose.
		`+ _log.debug('From: %s', from_email)`
		`+ _log.debug('To: %s', to_mail)`
		`+ _log.debug('Subject: %s', subject)`
		`+ _log.debug('in_reply_to: %s', in_reply_to)`
		`+ _log.debug('mail_id: %s', mail_id)`
		`+ _log.debug('Contents:')`
		`+ _log.debug(text.encode('utf-8'))`
		`+ _log.debug('*****************')`
		`+ _log.debug(msg.as_string())`
		`+ _log.debug('***/EMAIL****')`
		`continue`
		`try:`
		`if smtp is None:`

farhaan commented 6 years ago

This commits makes the current docker-compose.yml to work with the latest version of docker-compose, documentation on creating the initial directories are added to the docker-compose section.

Signed-off-by: Farhaan Bukhsh farhaan.bukhsh@gmail.com

rebased onto 6b377558ac41dcb7bbeb5943fbf4ae6c3d24fe37

6 years ago

cverna commented on line 31 of dev/docker-compose.yml 6 years ago

it is missing the read_only set to true here.
I think ../lcl/attachments:/attachments:ro should work

cverna commented on line 5 of pagure/lib/notify.py 6 years ago

@pingou any reason we used print statement here ?

pingou commented on line 16 of pagure/lib/notify.py 6 years ago

This isn't quite related to docker :)

cverna commented 6 years ago

One comment and one question :) but looks good otherwise

cverna commented on line 16 of pagure/lib/notify.py 6 years ago