Merge branch 'master' into 'master'

Master Configurações para correção do job(jenkins) See merge request !1

Merge branch 'master' into 'master'
Master Configurações para correção do job(jenkins) See merge request !1
Carlos Vieira
2 parents e364ec48 60f8d807
Showing 2 changed files with 3 additions and 1 deletions Show diff stats
docker/conf/httpd.conf
docker/docker-compose.yml
@@ -53,6 +53,8 @@ LoadModule negotiation_module modules/mod_negotiation.so
  
 Header set Access-Control-Allow-Origin "*"
  
+AddDefaultCharset ISO-8859-1
+
 AddType application/x-font-woff .woff
  
 AddHandler type-map .var
@@ -12,5 +12,5 @@ web:
   ports:
   - 80:80/tcp
   tty: true
-  image: hub.docker.planejamento.gov.br/barra-brasil:2.1.21
+  image: barrabrasil/barra-brasil:${VERSION}
   stdin_open: true
...	...	@@ -53,6 +53,8 @@ LoadModule negotiation_module modules/mod_negotiation.so
53	53
54	54	Header set Access-Control-Allow-Origin "*"
55	55
	56	+AddDefaultCharset ISO-8859-1
	57	+
56	58	AddType application/x-font-woff .woff
57	59
58	60	AddHandler type-map .var
...	...
...	...	@@ -12,5 +12,5 @@ web:
12	12	ports:
13	13	- 80:80/tcp
14	14	tty: true
15		- image: hub.docker.planejamento.gov.br/barra-brasil:2.1.21
	15	+ image: barrabrasil/barra-brasil:${VERSION}
16	16	stdin_open: true
...	...