Merge Request #1

← To merge requests From rafaelximenes:master into govbr:master
Merged
govbr/barra-govbr!1
Created by Rafael Ximenes

Master

Configurações para correção do job(jenkins)

Assignee: None
Milestone: None

Merged by Carlos Vieira

Commits (1)
2 participants
Showing 2 changed files   Show diff stats
docker/conf/httpd.conf
  Diff comments   Edit   View file @60f8d80
@@ -53,6 +53,8 @@ LoadModule negotiation_module modules/mod_negotiation.so @@ -53,6 +53,8 @@ LoadModule negotiation_module modules/mod_negotiation.so
53 53
54 Header set Access-Control-Allow-Origin "*" 54 Header set Access-Control-Allow-Origin "*"
55 55
  56 +AddDefaultCharset ISO-8859-1
  57 +
56 AddType application/x-font-woff .woff 58 AddType application/x-font-woff .woff
57 59
58 AddHandler type-map .var 60 AddHandler type-map .var
docker/docker-compose.yml
  Diff comments   Edit   View file @60f8d80
@@ -12,5 +12,5 @@ web: @@ -12,5 +12,5 @@ web:
12 ports: 12 ports:
13 - 80:80/tcp 13 - 80:80/tcp
14 tty: true 14 tty: true
15 - image: hub.docker.planejamento.gov.br/barra-brasil:2.1.21 15 + image: barrabrasil/barra-brasil:${VERSION}
16 stdin_open: true 16 stdin_open: true