Download as
Browse Code »

Commit 27b9f6d22226d645fb602c5dd4a3b5ddbf1758e2

Authored by Guilherme Cantoni
1 parent d2c65f43
Exists in master

Atualização do box do Vagrant com os drives do VirtualBoxGuestAdditions

Showing 3 changed files with 10 additions and 25 deletions   Show diff stats
Vagrantfile
  Diff comments   View file @27b9f6d
... ... @@ -25,7 +25,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
25 25 # config.vm.box = "guilhermeadc/centos65"
26 26 # config.vm.box_download_checksum = "76a2a61de2d89f6cfd4d795e57cc4406"
27 27 # config.vm.box_download_checksum_type = "md5"
28   - config.vm.box = "hashicorp/precise64"
  28 + config.vm.box = "processoeletronico/centos-6.6"
29 29  
30 30 # Disable automatic box update checking. If you disable this, then
31 31 # boxes will only be checked for updates when the user runs
... ... @@ -55,13 +55,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
55 55 vb.customize ["modifyvm", :id, "--memory", params_memoria_vm, "--usb", "off", "--audio", "none"]
56 56 end
57 57  
58   - # Correção da bug do VirtualBox relacionado ao Guest Additions
59   - config.vm.provision "shell", run: "always", inline: <<SCRIPT
60   - apt-get update -y
61   - apt-get install -y linux-headers-$(uname -r) dkms
62   - /etc/init.d/vboxadd setup
63   -SCRIPT
64   -
65 58 config.vm.provision "shell",
66 59 args: [File.basename(params_script_sei), File.basename(params_script_sip)],
67 60 inline: <<SCRIPT
... ... @@ -87,22 +80,22 @@ SCRIPT
87 80 args: "-v /mnt/sei/arquivos:/var/sei/arquivos",
88 81 cmd: "true"
89 82  
90   - # docker run -it --name sei_db -p 3306:3306 --rm processoeletronico/mysql:latest
  83 + # docker run -d --name sei_db -p 3306:3306 processoeletronico/mysql:latest
91 84 docker.run "sei_db", image: "processoeletronico/mysql:latest",
92 85 daemonize: true,
93 86 args: "-p 3306:3306"
94 87  
95   - # docker run -it --name sei_solr -p 8983:8983 --rm -v /mnt/sei/src/sei/solr:/mnt/sei/index processoeletronico/solr:latest
  88 + # docker run -d --name sei_solr -p 8983:8983 -v /mnt/sei/src/sei/solr:/mnt/sei/index processoeletronico/solr:latest
96 89 docker.run "sei_solr", image: "processoeletronico/solr:latest",
97 90 daemonize: true,
98 91 args: "-p 8983:8983 -v /mnt/sei/src/sei/solr:/mnt/sei/index"
99 92  
100   - # docker run -it --name sei_jod -p 8080:8080 --rm processoeletronico/jod:latest
  93 + # docker run -d --name sei_jod -p 8080:8080 processoeletronico/jod:latest
101 94 docker.run "sei_jod", image: "processoeletronico/jod:latest",
102 95 daemonize: true,
103 96 args: "-p 8080:8080"
104 97  
105   - # docker run -it --name sei_www -p 80:80 --rm --link sei_solr:solr --link sei_db:db --link sei_jod:jod -v /mnt/sei/src:/var/www/html -v /mnt/sei/ops/sei:/mnt/sei/ops/sei --volumes-from sei_data processoeletronico/sei:latest
  98 + # docker run -d --name sei_www -p 80:80 --link sei_solr:solr --link sei_db:db --link sei_jod:jod -v /mnt/sei/src:/var/www/html -v /mnt/sei/ops/sei:/mnt/sei/ops/sei --volumes-from sei_data processoeletronico/sei:latest
106 99 docker.run "sei_www", image: "processoeletronico/sei:latest",
107 100 daemonize: true,
108 101 args: "-p 80:80 --link sei_db:db --link sei_solr:solr --link sei_jod:jod -v /mnt/sei/src:/var/www/html -v /mnt/sei/ops/sei:/mnt/sei/ops/sei --volumes-from sei_data"
... ... @@ -113,4 +106,4 @@ SCRIPT
113 106  
114 107 # Inicialização dos containers em caso de reinicialização da máquina host
115 108 config.vm.provision "shell", run: "always", inline: "docker start sei_db sei_solr sei_jod sei_www"
116   -end
117 109 \ No newline at end of file
  110 +end
... ...
jod/Dockerfile
  Diff comments   View file @27b9f6d
... ... @@ -15,24 +15,17 @@ MAINTAINER PEN - Processo Eletrônico Nacional
15 15 # Instalação do MySQL seguindo as recomendações descritas na documentação do SEI
16 16 # Ref: http://<WIKI DO PROJETO>#<SESSAO DE INSTALAÇÃO DO MYSQL>
17 17  
18   -# Instalação dos utilitários utilizados no provisionamento
19   -RUN yum install -y wget unzip
20   -
21   -# Instalação do pacote Java JDK
22   -RUN yum -y update java-1.7.0-openjdk-devel && \
23   - yum install -y java-1.7.0-openjdk-devel
24   -
25   -# Instalação do pacote office responsável pela conversão para PDF
26   -RUN yum -y update libreoffice libreoffice-headless && \
27   - yum install -y libreoffice libreoffice-headless
  18 +# Instalação do pacote Java JDK e utilitários utilizados no provisionamento
  19 +RUN yum -y update && \
  20 + yum install -y java-1.7.0-openjdk-devel wget unzip libreoffice libreoffice-headless
28 21  
29 22 # Instalação da api de serviços de conversão de documentos
30 23 ADD jodconverter-tomcat-2.2.2.zip /opt/
31   -# RUN wget -q -O /opt/jodconverter-tomcat-2.2.2.zip http://sourceforge.net/projects/jodconverter/files/JODConverter/2.2.2/jodconverter-tomcat-2.2.2.zip/download
32 24 RUN unzip /opt/jodconverter-tomcat-2.2.2.zip -d /opt && rm /opt/jodconverter-tomcat-2.2.2.zip
33 25  
34 26 # Script de inicialização dos serviços
35 27 ADD run.sh /run.sh
  28 +
36 29 RUN chmod +x /run.sh
37 30  
38 31 ##################### FIM DA INSTALACAO #####################
... ...
jod/run.sh
  Diff comments   View file @27b9f6d
1 1 #!/usr/bin/env bash
2   -
3 2 SOFFICE_PATH=/usr/bin/soffice
4 3 TOMCAT6_PATH=/opt/jodconverter-tomcat-2.2.2/bin/catalina.sh
5 4  
... ...