diversos fixes (#107)

* Ajuste na imagem base centos para repositorio alternativo * ajuste no ffmpeg e oracle client 23 * SqlServer 2019
pengovbr · Jan 22, 2025 · 6d14ab2 · 6d14ab2
1 parent 9ff07b6
commit 6d14ab2
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 28 deletions.
diff --git a/containers/app-php8/app-base-php8/assets/copy-packages.sh b/containers/app-php8/app-base-php8/assets/copy-packages.sh
@@ -12,8 +12,6 @@ curl -L -O \
     -O \
     https://github.com/spbgovbr/sei-docker-binarios/raw/main/pacoteslinux/wkhtmltox-0.12.6.1-2.almalinux9.x86_64.rpm \
     -O \
-    https://github.com/spbgovbr/sei-docker-binarios/raw/main/pacoteslinux/oracle-instantclient-basic-21.12.0.0.0-1.el9.x86_64.rpm \
-    -O \
-    https://github.com/spbgovbr/sei-docker-binarios/raw/main/pacoteslinux/oracle-instantclient-devel-21.12.0.0.0-1.el9.x86_64.rpm
+	https://github.com/pengovbr/sei-docker-binarios/raw/refs/heads/main/pacoteslinux/oracle-instantclient-basic-23.6.0.24.10-1.el9.x86_64.rpm
 
 cd -
diff --git a/containers/app-php8/app-base-php8/assets/install.sh b/containers/app-php8/app-base-php8/assets/install.sh
@@ -26,6 +26,7 @@ localedef pt_BR.ISO8859-1 -i pt_BR -f ISO-8859-1
 
 dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm
 dnf install -y https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm
+dnf config-manager --set-enabled crb
 dnf install -y ffmpeg
 
 
@@ -79,16 +80,17 @@ if [ "$IMAGEM_APP_PACOTEORACLE_PRESENTE" == "true" ]; then
 
     # ORACLE oci
 
-    yum install -y oracle-instantclient-basic-21.12.0.0.0-1.el9.x86_64.rpm
-    yum install -y oracle-instantclient-devel-21.12.0.0.0-1.el9.x86_64.rpm
+    #yum install -y oracle-instantclient-basic-21.12.0.0.0-1.el9.x86_64.rpm
+    #yum install -y oracle-instantclient-devel-21.12.0.0.0-1.el9.x86_64.rpm
+	yum install -y oracle-instantclient-basic-23.6.0.24.10-1.el9.x86_64.rpm
 
-    rm -rf oracle-instantclient-basic-21.12.0.0.0-1.el9.x86_64.rpm oracle-instantclient-devel-21.12.0.0.0-1.el9.x86_64.rpm
+    rm -rf oracle-instantclient-basic-23.6.0.24.10-1.el9.x86_64.rpm
 
     #yum install -y systemtap-sdt-devel
     #pecl channel-update pecl.php.net
     #export PHP_DTRACE=yes && echo "" | pecl install oci8-3.3.0 && unset PHP_DTRACE
     #echo "extension=oci8.so" > /etc/php.d/oci8.ini
-    
+
     yum install -y php-oci8
 
 fi

diff --git a/containers/base-centos/Dockerfile b/containers/base-centos/Dockerfile
@@ -2,4 +2,9 @@
 # SO Centos Oficial - apenas redundancia do repo oficial
 ################################################################################
 
-FROM centos:7
+FROM centos:7
+
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo && \
+    sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo && \
+    sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo && \
+	yum update -y
diff --git a/containers/databases/sqlserver-base/Dockerfile b/containers/databases/sqlserver-base/Dockerfile
@@ -2,5 +2,5 @@
 # SqlServer Imagem Alternativa - apenas redundancia do repo oficial
 ################################################################################
 
-FROM processoeletronico/sei4-sqlserver:1.0
+FROM liaisonintl/mssql-server-linux:v2019
 #liaisonintl/mssql-server-linux
diff --git a/containers/databases/sqlserver-sei40/Dockerfile b/containers/databases/sqlserver-sei40/Dockerfile
@@ -13,7 +13,7 @@ FROM ${IMAGEM_BASE}
 
 ARG GIT_DB_REF=https://github.com/spbgovbr/sei-db-ref-executivo/raw/master
 
-ENV TERM xterm \
+ENV TERM=xterm \
     ACCEPT_EULA=Y \
     SA_PASSWORD='yourStrong(!)Password'
 

diff --git a/containers/databases/sqlserver-sei40/assets/install.sh b/containers/databases/sqlserver-sei40/assets/install.sh
@@ -15,7 +15,7 @@ sleep 30
 mv /tmp/sip_4_0_0_BD_Ref_Exec.bak /tmp/sip_sqlserver.bak
 mv /tmp/sei_4_0_0_BD_Ref_Exec.bak /tmp/sei_sqlserver.bak
 
-tsql -S localhost -U sa -P $SA_PASSWORD < /tmp/restore.sql
+/opt/mssql-tools18//bin/sqlcmd -S localhost -U sa -C -P $SA_PASSWORD < /tmp/restore.sql
 
 # Remover arquivos temporários
 rm -rf /tmp/*

diff --git a/containers/databases/sqlserver-sei41/Dockerfile b/containers/databases/sqlserver-sei41/Dockerfile
@@ -13,7 +13,7 @@ FROM ${IMAGEM_BASE}
 
 ARG GIT_DB_REF=https://github.com/spbgovbr/sei-db-ref-executivo/raw/master
 
-ENV TERM xterm \
+ENV TERM=xterm \
     ACCEPT_EULA=Y \
     SA_PASSWORD='yourStrong(!)Password'
 

diff --git a/containers/databases/sqlserver-sei41/assets/install.sh b/containers/databases/sqlserver-sei41/assets/install.sh
@@ -15,7 +15,7 @@ sleep 30
 mv /tmp/sip_4_1_0_BD_Ref_Exec.bak /tmp/sip_sqlserver.bak
 mv /tmp/sei_4_1_0_BD_Ref_Exec.bak /tmp/sei_sqlserver.bak
 
-tsql -S localhost -U sa -P $SA_PASSWORD < /tmp/restore.sql
+/opt/mssql-tools18//bin/sqlcmd -S localhost -U sa -C -P $SA_PASSWORD < /tmp/restore.sql
 
 # Remover arquivos temporários
 rm -rf /tmp/*

diff --git a/containers/envcontainers.env.modelo b/containers/envcontainers.env.modelo
@@ -1,5 +1,5 @@
 DOCKER_REGISTRY=processoeletronico
-DOCKER_CONTAINER_VERSAO_PRODUTO=3.5.3
+DOCKER_CONTAINER_VERSAO_PRODUTO=3.5.4
 
 IMAGEM_BASE_CENTOS=${DOCKER_REGISTRY}/base-centos7
 IMAGEM_BASE_CENTOS_VERSAO=latest

diff --git a/containers/jod/assets/install.sh b/containers/jod/assets/install.sh
@@ -3,12 +3,6 @@
 # Configuração do pacote de línguas pt_BR
 localedef pt_BR -i pt_BR -f ISO-8859-1
 
-# Corrige os repositórios CentOS para resolver o erro "Could not resolve host: mirrorlist.centos.org; Unknown error"
-# Conforme solução oficial https://access.redhat.com/solutions/7077708
-sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
-sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
-sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
-
 # Instalação do utilitários necessários para o provisionamento
 yum -y install unzip java-1.7.0-openjdk wget unzip libreoffice libreoffice-headless
 

diff --git a/dev/envs/env-mysql-sei4.env b/dev/envs/env-mysql-sei4.env
@@ -1,4 +1,4 @@
-ENVIRONMENT_VERSION=3.5.0
+ENVIRONMENT_VERSION=3.5.4
 
 DOCKER_REGISTRY=processoeletronico
 

diff --git a/dev/envs/env-mysql-sei5.env b/dev/envs/env-mysql-sei5.env
@@ -1,4 +1,4 @@
-ENVIRONMENT_VERSION=3.5.0
+ENVIRONMENT_VERSION=3.5.4
 
 DOCKER_REGISTRY=processoeletronico
 

diff --git a/dev/envs/env-oracle-sei4.env b/dev/envs/env-oracle-sei4.env
@@ -1,4 +1,4 @@
-ENVIRONMENT_VERSION=3.5.0
+ENVIRONMENT_VERSION=3.5.4
 
 DOCKER_REGISTRY=processoeletronico
 

diff --git a/dev/envs/env-oracle-sei5.env b/dev/envs/env-oracle-sei5.env
@@ -1,4 +1,4 @@
-ENVIRONMENT_VERSION=3.5.0
+ENVIRONMENT_VERSION=3.5.4
 
 DOCKER_REGISTRY=processoeletronico
 

diff --git a/dev/envs/env-postgres-sei4.env b/dev/envs/env-postgres-sei4.env
@@ -1,4 +1,4 @@
-ENVIRONMENT_VERSION=3.5.0
+ENVIRONMENT_VERSION=3.5.4
 
 DOCKER_REGISTRY=processoeletronico
 

diff --git a/dev/envs/env-postgres-sei5.env b/dev/envs/env-postgres-sei5.env
@@ -1,4 +1,4 @@
-ENVIRONMENT_VERSION=3.5.0
+ENVIRONMENT_VERSION=3.5.4
 
 DOCKER_REGISTRY=processoeletronico
 

diff --git a/dev/envs/env-sqlserver-sei4.env b/dev/envs/env-sqlserver-sei4.env
@@ -1,4 +1,4 @@
-ENVIRONMENT_VERSION=3.5.0
+ENVIRONMENT_VERSION=3.5.4
 
 DOCKER_REGISTRY=processoeletronico
 

diff --git a/dev/envs/env-sqlserver-sei5.env b/dev/envs/env-sqlserver-sei5.env
@@ -1,4 +1,4 @@
-ENVIRONMENT_VERSION=3.5.0
+ENVIRONMENT_VERSION=3.5.4
 
 DOCKER_REGISTRY=processoeletronico