migrate to shinsenter/php

Author: altendorfme

Dockerfile

@@ -1,54 +1,36 @@
-FROM php:8.3-fpm AS base
-
-RUN apt-get update && apt-get install -y \
-    nginx \
-    nano \
-    procps \
-    psmisc \
-    git \
-    htop \
-    nano \
-    cron \
-    openssl \
-    libonig-dev \
-    libxml2-dev \
-    libssl-dev \
-    libpng-dev \
-    libjpeg-dev \
-    libfreetype6-dev \
-    libgmp-dev \
-    libzip-dev \
-    && docker-php-ext-configure gd --with-jpeg --with-freetype \
-    && docker-php-ext-install mysqli pdo_mysql sockets gd zip gmp bcmath \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-FROM base AS builder
-
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
-
-COPY app/ /app/
-
-WORKDIR /app
-
-RUN composer config platform.php-64bit 8.3
-RUN composer install --no-interaction --optimize-autoloader
-
-FROM base
-
-COPY --from=builder /usr/local/bin/composer /usr/local/bin/composer
-COPY --from=builder /app /app
-
-COPY default.conf /etc/nginx/sites-available/default
-COPY setup/ /setup/
+FROM shinsenter/php:8.3-fpm-nginx
+
+# Default application envs
+ENV ENABLE_CRONTAB=1
+ENV APP_PATH=/app
+ENV DOCUMENT_ROOT=public
+ENV TZ=UTC
 
-COPY docker-entrypoint.sh /usr/local/bin/
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+# Copy application files
+COPY app/ ${APP_PATH}/
+WORKDIR ${APP_PATH}
 
-RUN chown -R www-data:www-data /app \
-    && chmod -R 755 /app
+# Install composer dependencies
+RUN composer config platform.php-64bit 8.3 && \
+    composer install --no-interaction --optimize-autoloader --no-dev
 
-ENV TZ=UTC
+# Create autorun scripts
+COPY setup/ /setup/
+RUN mkdir -p /startup && \
+    ln -sf /setup/start.php /startup/20-migrations.php
+
+# Copy cron jobs configuration
+COPY crontab /etc/cron.d/lerama-cron
+RUN chmod 0644 /etc/cron.d/lerama-cron
+
+# Copy setup script
+COPY docker-entrypoint.sh /startup/10-setup-env.sh
+RUN chmod +x /startup/10-setup-env.sh
 
-EXPOSE 8077
+# Set permissions
+RUN chown -R www-data:www-data ${APP_PATH} && \
+    chmod -R 755 ${APP_PATH} && \
+    mkdir -p ${APP_PATH}/${DOCUMENT_ROOT}/storage/thumbnails && \
+    chown -R www-data:www-data ${APP_PATH}/${DOCUMENT_ROOT}/storage
 
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+EXPOSE 80

README.md

@@ -40,7 +40,7 @@ Configure pelo menos:
 docker-compose up -d
 ```
 
-4. Acesse: `http://localhost:8077`
+4. Acesse: `http://localhost:80`
 
 ## 🎯 CLI
 

crontab

@@ -0,0 +1,8 @@
+# Process feeds every hour
+0 * * * * /usr/local/bin/php /app/bin/lerama feed:process 2>&1
+
+# Check feed status every hour at :30
+30 * * * * /usr/local/bin/php /app/bin/lerama feed:check-status 2>&1
+
+# Update proxy list daily at midnight
+0 0 * * * /usr/local/bin/php /app/bin/lerama proxy:update 2>&1

default.conf

@@ -22,7 +22,7 @@ services:
       SMTP_FROM_EMAIL: [email protected]
       SMTP_FROM_NAME: Lerama
     ports:
-      - 8077:8077
+      - 80:80
     volumes:
       - ./lerama/storage:/app/public/storage
     restart: unless-stopped

docker-compose.yml

@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 
+# Colors for output
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
@@ -10,74 +11,11 @@ log_success() {
     echo -e "${GREEN}[✓] $1${NC}"
 }
 
-log_error() {
-    echo -e "${RED}[✗] $1${NC}"
-    exit 1
-}
-
 log_info() {
     echo -e "${YELLOW}[i] $1${NC}"
 }
 
-check_nginx() {
-    log_info "Checking Nginx process status..."
-    local max_attempts=5
-    local attempt=0
-
-    while [ $attempt -lt $max_attempts ]; do
-        if pgrep nginx > /dev/null; then
-            log_success "Nginx started successfully"
-            return 0
-        fi
-        
-        log_info "Waiting for Nginx to start... (Attempt $((attempt+1))/$max_attempts)"
-        sleep 3
-        attempt=$((attempt+1))
-    done
-
-    log_error "Failed to start Nginx after $max_attempts attempts"
-}
-
-check_php_fpm() {
-    log_info "Checking PHP-FPM process status..."
-    local max_attempts=5
-    local attempt=0
-
-    while [ $attempt -lt $max_attempts ]; do
-        if pgrep php-fpm > /dev/null; then
-            log_success "PHP-FPM started successfully"
-            return 0
-        fi
-        
-        log_info "Waiting for PHP-FPM to start... (Attempt $((attempt+1))/$max_attempts)"
-        sleep 3
-        attempt=$((attempt+1))
-    done
-
-    log_error "Failed to start PHP-FPM after $max_attempts attempts"
-}
-
-echo -e "\n${YELLOW}Lerama: Starting${NC}\n"
-
-# Set timezone
-if [ -n "$TZ" ]; then
-    log_info "Setting timezone to $TZ..."
-    ln -snf /usr/share/zoneinfo/$TZ /etc/localtime
-    echo $TZ > /etc/timezone
-    
-    echo "date.timezone = $TZ" > /usr/local/etc/php/conf.d/timezone.ini
-    log_success "Timezone set to $TZ for both system and PHP"
-else
-    log_info "No TZ environment variable set, using UTC as default timezone"
-
-    ln -snf /usr/share/zoneinfo/UTC /etc/localtime
-    echo "UTC" > /etc/timezone
-    
-    echo "date.timezone = UTC" > /usr/local/etc/php/conf.d/timezone.ini
-    log_success "Timezone set to UTC for both system and PHP"
-fi
-
-# Create or update .env file with environment variables
+# Create .env file with environment variables
 log_info "Setting up environment variables in /app/.env..."
 cat > /app/.env << EOL
 APP_NAME=Lerama
@@ -102,102 +40,7 @@ EOL
 
 log_success "Environment variables set in /app/.env"
 
-log_info "Starting PHP-FPM..."
-php-fpm &
-check_php_fpm
-
-# Ensure /app/storage directory exists and has correct permissions
-log_info "Checking /app/public/storage directory..."
-if [ ! -d /app/public/storage ]; then
-    log_info "Creating /app/public/storage directory..."
-    mkdir -p /app/public/storage
-    log_success "/app/public/storage directory created"
-fi
-
-# Database
-log_info "Checking database tables..."
-php /setup/check-db.php
-
-# NGINX
-log_info "Checking Nginx configuration..."
-nginx -t
-if [ $? -ne 0 ]; then
-    log_error "Invalid Nginx configuration"
-else
-    log_success "Valid Nginx configuration"
-fi
-
-log_info "Starting Nginx..."
-nginx -g "daemon off;" &
-check_nginx
-
-# Cron
-log_info "Setting up cron jobs..."
-
-# Create a directory for cron scripts
-mkdir -p /app/cron-scripts
-chmod 755 /app/cron-scripts
-
-cat > /app/cron-scripts/feed_process.sh << 'EOL'
-#!/bin/bash
-echo "$(date): Starting feed:process cron job"
-/usr/local/bin/php /app/bin/lerama feed:process 2>&1 | sed "s/^/[feed:process] /"
-echo "$(date): Finished feed:process cron job"
-EOL
-
-cat > /app/cron-scripts/feed_check_status.sh << 'EOL'
-#!/bin/bash
-echo "$(date): Starting feed:check-status cron job"
-/usr/local/bin/php /app/bin/lerama feed:check-status 2>&1 | sed "s/^/[feed:check-status] /"
-echo "$(date): Finished feed:check-status cron job"
-EOL
-
-cat > /app/cron-scripts/proxy_update.sh << 'EOL'
-#!/bin/bash
-echo "$(date): Starting proxy_update cron job"
-/usr/local/bin/php /app/bin/lerama proxy:update 2>&1 | sed "s/^/[proxy:update] /"
-echo "$(date): Finished proxy_update cron job"
-EOL
-
-# Make the scripts executable
-chmod +x /app/cron-scripts/*.sh
-
-# Set up crontab to use the wrapper scripts and redirect output to Docker logs
-(
-    echo "0 * * * * /app/cron-scripts/feed_process.sh >> /proc/1/fd/1 2>> /proc/1/fd/2"
-    echo "30 * * * * /app/cron-scripts/feed_check_status.sh >> /proc/1/fd/1 2>> /proc/1/fd/2"
-    echo "0 0 * * * /app/cron-scripts/proxy_update.sh >> /proc/1/fd/1 2>> /proc/1/fd/2"
-) | crontab -
-
-service cron restart
-
-log_success "Cron jobs added with stdout logging"
-
-# Update proxy list if PROXY_LIST is defined
+# Update proxy list if PROXY_LIST environment variable is defined
 if [ -n "$PROXY_LIST" ]; then
-    log_info "PROXY_LIST environment variable detected, updating proxy list..."
-    php /app/bin/lerama proxy:update
-    if [ $? -eq 0 ]; then
-        log_success "Proxy list updated successfully"
-    else
-        log_info "Failed to update proxy list, will retry later"
-    fi
-fi
-
-# Set correct permissions for /app/storage
-log_info "Setting permissions for /app/public/storage..."
-chown -R www-data:www-data /app/public/storage
-chmod -R 755 /app/public/storage
-log_success "Permissions set for /app/public/storage"
-
-# PHP-FPM
-if [ ! -d /var/run/php ]; then
-    log_info "Creating PHP-FPM directory..."
-    mkdir -p /var/run/php
-    chown -R www-data:www-data /var/run/php
-    log_success "PHP-FPM directory created"
-fi
-
-echo -e "\n${GREEN}Lerama: Initialized ===${NC}\n"
-
-wait -n
+    log_info "PROXY_LIST environment variable detected, will update proxy list after startup..."
+fi

docker-entrypoint.sh

@@ -105,7 +105,7 @@ function executeSqlFile($conn, $filePath, $migrationName = null) {
 }
 
 try {
-    $envFile = '../app/.env';
+    $envFile = '/app/.env';
     $env = parseEnvFile($envFile);
 
     if (empty($env)) {