Merge pull request #365 from geocine/nginx-charset-utf8

use utf8 charset on nginx
2016-10-14 14:31:56 -04:00 · 2016-10-15 01:01:59 +08:00 · 2016-10-14 12:28:42 -04:00 · 2016-10-14 12:26:11 -04:00
2 changed files with 3 additions and 2 deletions
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@ -1,4 +1,4 @@
-FROM mysql:latest
+FROM mysql:mysql:5.6
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@ -26,4 +26,5 @@ http {
  include /etc/nginx/conf.d/*.conf;
  include /etc/nginx/sites-available/*;
  open_file_cache max=100;
  charset UTF-8;
 }
Author	SHA1	Message	Date
Mahmoud Zalt	c4cd3ed2ac	Merge pull request #365 from geocine/nginx-charset-utf8 use utf8 charset on nginx	2016-10-14 14:31:56 -04:00
Aivan Monceller	ffe45fed50	use utf8 charset on nginx	2016-10-15 01:01:59 +08:00
Mahmoud Zalt	bd1f6ebd8a	Merge pull request #364 from LaraDock/downgrade-mysql downgrade MySQL to 5.6 (stable)	2016-10-14 12:28:42 -04:00
Mahmoud Zalt	f35e5501db	downgrade MySQL to 5.6 (stable)	2016-10-14 12:26:11 -04:00
`@ -1,4 +1,4 @@`
	`FROM mysql:latest`	`FROM mysql:mysql:5.6`

	`MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>`	`MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>`