correção das aspas em ambiente que utilizem .env no docker

This commit is contained in:
Renan Bernordi 2025-01-04 17:13:33 -03:00
parent bb20a233f8
commit de920bef0e
2 changed files with 47 additions and 42 deletions

View file

@ -8,13 +8,13 @@ services:
- ./app/cache:/app/cache - ./app/cache:/app/cache
- ./app/logs:/app/logs - ./app/logs:/app/logs
environment: environment:
- SITE_NAME=Marreta - SITE_NAME=${SITE_NAME:-}
- SITE_DESCRIPTION="Chapéu de paywall é marreta!" - SITE_DESCRIPTION=${SITE_DESCRIPTION:-}
- SITE_URL=https://marreta.localhost - SITE_URL=${SITE_URL:-https://marreta.localhost}
- DNS_SERVERS=1.1.1.1,8.8.8.8 - DNS_SERVERS=${DNS_SERVER:-}
- LANGUAGE=pt-br - LANGUAGE=${LANGUAGE:-}
- DEBUG=false - DEBUG=${DEBUG:-}
- SELENIUM_HOST=selenium-hub:4444 - SELENIUM_HOST=${SELENIUM_HOST:-selenium-hub:4444}
restart: unless-stopped restart: unless-stopped
selenium-chromium: selenium-chromium:
container_name: selenium-chromium container_name: selenium-chromium

View file

@ -3,45 +3,50 @@
########################################### ###########################################
# Marreta Docker Entrypoint # Marreta Docker Entrypoint
# #
# This script initializes the Marreta container:
# - Configures environment variables
# - Adjusts directory permissions
# - Starts and checks services (PHP-FPM and Nginx)
#
# Este script inicializa o container do Marreta: # Este script inicializa o container do Marreta:
# - Configura variáveis de ambiente # - Configura variáveis de ambiente
# - Ajusta permissões dos diretórios # - Ajusta permissões dos diretórios
# - Inicia e verifica serviços (PHP-FPM e Nginx) # - Inicia e verifica serviços (PHP-FPM e Nginx)
########################################### ###########################################
# Cores para output # Output colors
RED='\033[0;31m' RED='\033[0;31m'
GREEN='\033[0;32m' GREEN='\033[0;32m'
YELLOW='\033[1;33m' YELLOW='\033[1;33m'
NC='\033[0m' # No Color NC='\033[0m' # No Color
# Função para logs de sucesso # Success log function
log_success() { log_success() {
echo -e "${GREEN}[✓] $1${NC}" echo -e "${GREEN}[✓] $1${NC}"
} }
# Função para logs de erro # Error log function
log_error() { log_error() {
echo -e "${RED}[✗] $1${NC}" echo -e "${RED}[✗] $1${NC}"
exit 1 exit 1
} }
# Função para logs de informação # Info log function
log_info() { log_info() {
echo -e "${YELLOW}[i] $1${NC}" echo -e "${YELLOW}[i] $1${NC}"
} }
echo -e "\n${YELLOW}=== Iniciando Container Marreta ===${NC}\n" echo -e "\n${YELLOW}=== Starting Marreta ===${NC}\n"
# === Configuração de Variáveis de Ambiente === # === Environment Variables Configuration ===
log_info "Configurando variáveis de ambiente..." log_info "Configuring environment variables..."
if [ -n "${SITE_NAME}" ]; then if [ -n "${SITE_NAME}" ]; then
echo "SITE_NAME=${SITE_NAME}" >> /app/.env echo "SITE_NAME=\"${SITE_NAME}\"" >> /app/.env
fi fi
if [ -n "${SITE_DESCRIPTION}" ]; then if [ -n "${SITE_DESCRIPTION}" ]; then
echo "SITE_DESCRIPTION=${SITE_DESCRIPTION}" >> /app/.env echo "SITE_DESCRIPTION=\"${SITE_DESCRIPTION}\"" >> /app/.env
fi fi
if [ -n "${SITE_URL}" ]; then if [ -n "${SITE_URL}" ]; then
@ -56,7 +61,7 @@ if [ -n "${DNS_SERVERS}" ]; then
echo "DNS_SERVERS=${DNS_SERVERS}" >> /app/.env echo "DNS_SERVERS=${DNS_SERVERS}" >> /app/.env
fi fi
# Configurações S3 # S3 Settings
if [ -n "${S3_CACHE_ENABLED}" ]; then if [ -n "${S3_CACHE_ENABLED}" ]; then
echo "S3_CACHE_ENABLED=${S3_CACHE_ENABLED}" >> /app/.env echo "S3_CACHE_ENABLED=${S3_CACHE_ENABLED}" >> /app/.env
fi fi
@ -89,76 +94,76 @@ if [ -n "${S3_ENDPOINT}" ]; then
echo "S3_ENDPOINT=${S3_ENDPOINT}" >> /app/.env echo "S3_ENDPOINT=${S3_ENDPOINT}" >> /app/.env
fi fi
# Configurações do Selenium # Selenium Settings
if [ -n "${SELENIUM_HOST}" ]; then if [ -n "${SELENIUM_HOST}" ]; then
echo "SELENIUM_HOST=${SELENIUM_HOST}" >> /app/.env echo "SELENIUM_HOST=${SELENIUM_HOST}" >> /app/.env
fi fi
# Configurações do Hawk.so # Hawk.so Settings
if [ -n "${HAWK_TOKEN}" ]; then if [ -n "${HAWK_TOKEN}" ]; then
echo "HAWK_TOKEN=${HAWK_TOKEN}" >> /app/.env echo "HAWK_TOKEN=${HAWK_TOKEN}" >> /app/.env
fi fi
log_success "Variáveis de ambiente configuradas" log_success "Environment variables configured"
# === Ajuste de Permissões === # === Permissions Adjustment ===
log_info "Ajustando permissões dos diretórios..." log_info "Adjusting directory permissions..."
chown -R www-data:www-data /app/cache /app/logs chown -R www-data:www-data /app/cache /app/logs
chmod -R 775 /app/cache /app/logs chmod -R 775 /app/cache /app/logs
log_success "Permissões ajustadas" log_success "Permissions adjusted"
# === Funções de Verificação de Serviços === # === Service Check Functions ===
check_nginx() { check_nginx() {
if ! pgrep nginx > /dev/null; then if ! pgrep nginx > /dev/null; then
log_error "Falha ao iniciar Nginx" log_error "Failed to start Nginx"
else else
log_success "Nginx iniciado com sucesso" log_success "Nginx started successfully"
fi fi
} }
check_php_fpm() { check_php_fpm() {
if ! pgrep php-fpm > /dev/null; then if ! pgrep php-fpm > /dev/null; then
log_error "Falha ao iniciar PHP-FPM" log_error "Failed to start PHP-FPM"
else else
log_success "PHP-FPM iniciado com sucesso" log_success "PHP-FPM started successfully"
fi fi
} }
# === Inicialização dos Serviços === # === Services Initialization ===
echo -e "\n${YELLOW}=== Iniciando serviços ===${NC}\n" echo -e "\n${YELLOW}=== Starting services ===${NC}\n"
# Diretório PHP-FPM # PHP-FPM Directory
if [ ! -d /var/run/php ]; then if [ ! -d /var/run/php ]; then
log_info "Criando diretório PHP-FPM..." log_info "Creating PHP-FPM directory..."
mkdir -p /var/run/php mkdir -p /var/run/php
chown -R www-data:www-data /var/run/php chown -R www-data:www-data /var/run/php
log_success "Diretório PHP-FPM criado" log_success "PHP-FPM directory created"
fi fi
# Iniciando PHP-FPM # Starting PHP-FPM
log_info "Iniciando PHP-FPM..." log_info "Starting PHP-FPM..."
php-fpm & php-fpm &
sleep 3 sleep 3
check_php_fpm check_php_fpm
# Verificando configuração Nginx # Checking Nginx configuration
log_info "Verificando configuração do Nginx..." log_info "Checking Nginx configuration..."
nginx -t nginx -t
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
log_error "Configuração do Nginx inválida" log_error "Invalid Nginx configuration"
else else
log_success "Configuração do Nginx válida" log_success "Valid Nginx configuration"
fi fi
# Iniciando Nginx # Starting Nginx
log_info "Iniciando Nginx..." log_info "Starting Nginx..."
nginx -g "daemon off;" & nginx -g "daemon off;" &
sleep 3 sleep 3
check_nginx check_nginx
echo -e "\n${GREEN}=== Container Marreta inicializado ===${NC}\n" echo -e "\n${GREEN}=== Marreta initialized ===${NC}\n"
wait -n wait -n