From 1afb69c1fab6173a0684cbae501dfbf95a20725f Mon Sep 17 00:00:00 2001 From: Marcelo De Oliveira Batista Date: Tue, 13 Aug 2019 17:01:41 -0300 Subject: [PATCH] Update do Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Revisão parcial do Dockerfile - Redução de imagens temporárias --- src/main/resources/ctxs/jboss/Dockerfile | 47 +++++++++++------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/src/main/resources/ctxs/jboss/Dockerfile b/src/main/resources/ctxs/jboss/Dockerfile index 94afd6c..07f2a6d 100644 --- a/src/main/resources/ctxs/jboss/Dockerfile +++ b/src/main/resources/ctxs/jboss/Dockerfile @@ -1,7 +1,9 @@ # -------------------------- Dockerfile (jboss) -------------------------- # FROM centos:7.1.1503 -MAINTAINER tssesia@jfrj.jus.br +LABEL maintainer="JFRJ; Marcelo de Oliveira Batista " \ + + #--- UTILITARIOS --- RUN yum -y install unzip @@ -9,10 +11,16 @@ RUN yum -y install tar RUN yum -y install curl # Cria estruturas de diretorios -RUN mkdir -p /opt/jboss-eap-6.2/welcome-content/ckeditor/ \ - && mkdir -p /home/resource/ \ - && mkdir -p /opt/jboss-eap-6.2/modules/ \ - && mkdir -p /siga/jdbctool-1.0/ \ +RUN set eux; \ + && groupadd -g 52677 jboss \ + && useradd -m -u 52677 -g jboss -c "JBoss EAP Admin User" jboss \ + && ln -s /opt/jboss-eap-6.2 /opt/jboss \ + && mkdir -p /var/log/jboss/sigadoc \ + && mkdir -p /opt/jboss/sigadoc/deployments \ + && mkdir -p /opt/jboss-eap-6.2/welcome-content/ckeditor/ \ + && mkdir -p /home/resource/ \ + && mkdir -p /opt/jboss-eap-6.2/modules/ \ + && mkdir -p /siga/jdbctool-1.0/ \ && mkdir -p /siga # Adiciona JDK homologada com aplicação SIGA @@ -74,12 +82,7 @@ ADD apps/ckeditor_4.5.7_full.zip /siga/ RUN unzip /siga/ckeditor_4.5.7_full.zip -d /opt/jboss-eap-6.2/welcome-content/ckeditor/ # Cria usuário jboss para execução do JBoss EAP -RUN groupadd -g 52677 jboss \ - && useradd -m -u 52677 -g jboss -c "JBoss EAP Admin User" jboss \ - && ln -s /opt/jboss-eap-6.2 /opt/jboss \ - && mkdir -p /var/log/jboss/sigadoc \ - && mkdir -p /siga \ - && mkdir -p /opt/jboss/sigadoc/deployments \ +RUN set eux; \ && chown -R jboss:jboss /home/jboss/ \ && chown -R jboss:root /siga/ \ && chown -R jboss:jboss /home/resource/ \ @@ -99,22 +102,16 @@ COPY lib/ojdbc6.jar /siga/jdbctool-1.0/lib/ojdbc6.jar # -- Instalacao flyway -- COPY lib/ojdbc6.jar /siga/flyway-3.0/jars/ojdbc6.jar -COPY conf/flyway/flyway.corporativo.properties /siga/flyway-3.0/conf/ -COPY conf/flyway/flyway.siga.properties /siga/flyway-3.0/conf/ -COPY conf/flyway/flyway.sigawf.properties /siga/flyway-3.0/conf/ -COPY conf/flyway/flyway.sigasr.properties /siga/flyway-3.0/conf/ -COPY conf/flyway/flyway.sigagc.properties /siga/flyway-3.0/conf/ -COPY conf/flyway/flyway.sigatp.properties /siga/flyway-3.0/conf/ +COPY conf/flyway/* /siga/flyway-3.0/conf/ #--- inicializacao default e aplicacao de patch do JBOSS -RUN tar -xzf /opt/jboss-eap-6.2/jboss-eap-6.2.tar.gz -C /opt/jboss-eap-6.2/ -RUN unzip /opt/jboss-eap-6.2/jboss-eap-6.2.3-patch.zip -d /opt/jboss-eap-6.2/ -RUN tar -xzf /opt/jboss-eap-6.2/modules/modulos-siga.tar.gz -C /opt/jboss-eap-6.2/modules/ -RUN tar -xzf /siga/jdbctool-1.0/jdbctool-1.0.tar.gz -C /siga/jdbctool-1.0/ -RUN tar -xzf /siga/flyway-commandline-3.0.tar.gz -C /siga/ - -RUN chmod +x /opt/jboss-eap-6.2/patchapply.sh -RUN /opt/jboss-eap-6.2/patchapply.sh +ADD /opt/jboss-eap-6.2/jboss-eap-6.2.tar.gz -C /opt/jboss-eap-6.2/ +ADD /opt/jboss-eap-6.2/modules/modulos-siga.tar.gz -C /opt/jboss-eap-6.2/modules/ +ADD /siga/jdbctool-1.0/jdbctool-1.0.tar.gz -C /siga/jdbctool-1.0/ +ADD /siga/flyway-commandline-3.0.tar.gz -C /siga/ + + +RUN /opt/jboss/bin/jboss-cli.sh --command="patch apply /opt/jboss-eap-6.2/jboss-eap-6.2.3-patch.zip" ADD scripts/inicializacao.sh /siga/ RUN chmod +x /siga/inicializacao.sh CMD bash -c '/siga/inicializacao.sh'