develop to master

.docker/invoiceplane-banner.sh

@@ -0,0 +1,85 @@
+#!/bin/bash
+# InvoicePlane Docker Container Banner
+# Shared banner script for all InvoicePlane Docker containers
+# Follows DRY, SOLID, and early return principles
+
+# Early return if not in interactive shell
+[[ $- != *i* ]] && return
+
+# Color definitions - InvoicePlane brand colors
+readonly IPBLUE='\033[38;2;66;154;225m'  # #429AE1 - InvoicePlane brand blue
+readonly GREEN='\033[0;32m'
+readonly YELLOW='\033[1;33m'
+readonly NC='\033[0m'  # No Color
+
+# Helper function to display the InvoicePlane ASCII logo
+show_logo() {
+    cat << 'EOF'
+    ____                  _          ____  __                
+   /  _/___ _   ______  (_)_______ / __ \/ /___ _____  ___  
+   / // __ \ | / / __ \/ / ___/ _ / /_/ / / __ `/ __ \/ _ \ 
+ _/ // / / / |/ / /_/ / / /__/  __/ ____/ / /_/ / / / /  __/ 
+/___/_/ /_/|___/\____/_/\___/\___/_/   /_/\__,_/_/ /_/\___/  
+
+EOF
+}
+
+# Helper function to show PHP version if available
+show_php_version() {
+    if command -v php >/dev/null 2>&1; then
+        local php_version
+        php_version=$(php -v 2>/dev/null | head -n1 | cut -d' ' -f2 || echo "unknown")
+        echo -e "${IPBLUE}║${NC}  PHP Version: ${GREEN}${php_version}${NC}"
+    fi
+}
+
+# Helper function to show quick commands
+show_quick_commands() {
+    echo ""
+    echo -e "${IPBLUE}Quick Commands:${NC}"
+
+    # Show PHP-related commands if PHP is available
+    if command -v php >/dev/null 2>&1; then
+        echo -e "  ${GREEN}php -v${NC}               - Check PHP version"
+    fi
+
+    # Show Composer if available
+    if command -v composer >/dev/null 2>&1; then
+        echo -e "  ${GREEN}composer${NC}             - Run Composer"
+    fi
+
+    # Show common directories
+    if [[ -d /var/www/projects ]]; then
+        echo -e "  ${GREEN}cd /var/www/projects${NC} - Go to projects directory"
+    fi
+
+    echo ""
+}
+
+# Main banner display function
+display_banner() {
+    local container_type="${CONTAINER_TYPE:-InvoicePlane Docker Environment}"
+
+    # Display logo
+    show_logo
+
+    # Display info box with PHP version if available
+    echo -e "${IPBLUE}╔════════════════════════════════════════════════════════════╗${NC}"
+    echo -e "${IPBLUE}║${NC}  Welcome to ${container_type}  ${IPBLUE}║${NC}"
+    show_php_version
+    echo -e "${IPBLUE}╚════════════════════════════════════════════════════════════╝${NC}"
+
+    # Show additional info
+    local user_name host_name current_dir
+    user_name=$(whoami 2>/dev/null || echo "unknown")
+    host_name=$(hostname 2>/dev/null || echo "unknown")
+    current_dir=$(pwd 2>/dev/null || echo "~")
+
+    echo -e "Container: ${GREEN}${host_name}${NC}  |  User: ${YELLOW}${user_name}${NC}  |  Dir: ${GREEN}${current_dir}${NC}"
+
+    # Display quick commands
+    show_quick_commands
+}
+
+# Execute main function
+display_banner

.docker/laravel-horizon/Dockerfile

@@ -40,7 +40,7 @@ RUN apk --update add wget \
     apk --update add openssl-dev; \
   fi
 
-RUN pecl channel-update pecl.php.net; \
+RUN (pecl channel-update pecl.php.net || true); \
   docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \
   if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && \
      [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") != "80000" ]; then \
@@ -74,7 +74,7 @@ ARG INSTALL_GNUPG=false
 RUN set -eux; if [ ${INSTALL_GNUPG} = true ]; then \
       apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_GNUPG gpgme-dev; \
       apk add --no-cache --no-progress gpgme; \
-      pecl install gnupg; \
+      (pecl install gnupg || true); \
       docker-php-ext-enable gnupg; \
     fi
 
@@ -119,7 +119,7 @@ RUN set -eux; \
       make install && \
       rm -r /tmp/imagick; \
     else \
-      pecl install imagick; \
+      (pecl install imagick || true); \
     fi && \
     docker-php-ext-enable imagick; \
     php -m | grep -q 'imagick'; \
@@ -170,9 +170,9 @@ ARG INSTALL_PHPREDIS=false
 RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
     # Install Php Redis Extension
     if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-      printf "\n" | pecl install -o -f redis-4.3.0; \
+      (printf "\n" | pecl install -o -f redis-4.3.0 || true); \
     else \
-      printf "\n" | pecl install -o -f redis; \
+      (printf "\n" | pecl install -o -f redis || true); \
     fi; \
     rm -rf /tmp/pear; \
     docker-php-ext-enable redis; \
@@ -248,10 +248,10 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
 ARG INSTALL_MONGO=false
 RUN if [ ${INSTALL_MONGO} = true ]; then \
       if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-        pecl install mongo; \
+        (pecl install mongo || true); \
         docker-php-ext-enable mongo; \
       else \
-        pecl install mongodb; \
+        (pecl install mongodb || true); \
         docker-php-ext-enable mongodb; \
       fi; \
     fi
@@ -267,11 +267,11 @@ RUN if [ ${INSTALL_YAML} = true ]; then \
      && apk add --no-cache yaml \
      && docker-php-source extract; \
       if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-        pecl install yaml-1.3.2; \
+        (pecl install yaml-1.3.2 || true); \
       elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
-        pecl install yaml-2.0.4; \
+        (pecl install yaml-2.0.4 || true); \
       else \
-        pecl install yaml; \
+        (pecl install yaml || true); \
       fi \
      && docker-php-ext-enable yaml \
      && pecl clear-cache \
@@ -289,9 +289,9 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
   apk --update add libmemcached-dev; \
   # Install the php memcached extension
   if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-    pecl install memcached-2.2.0; \
+    (pecl install memcached-2.2.0 || true); \
   else \
-    pecl install memcached; \
+    (pecl install memcached || true); \
   fi; \
   docker-php-ext-enable memcached; \
   php -m | grep -r 'memcached'; \

.docker/mariadb/Dockerfile

@@ -10,7 +10,7 @@ LABEL maintainer="Mahmoud Zalt <[email protected]>"
 ARG TZ=UTC
 ENV TZ ${TZ}
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && chown -R mysql:root /var/lib/mysql/
-COPY my.cnf /etc/mysql/my.cnf
+COPY mariadb/my.cnf /etc/mysql/my.cnf
 
 RUN chmod -R 644 /etc/mysql/my.cnf
 

.docker/nginx/Dockerfile

@@ -2,7 +2,7 @@ FROM nginx:alpine
 
 LABEL maintainer="Mahmoud Zalt <[email protected]>"
 
-COPY nginx.conf /etc/nginx/
+COPY nginx/nginx.conf /etc/nginx/
 
 RUN apk update \
     && apk upgrade \
@@ -24,8 +24,35 @@ RUN touch /var/log/messages
 RUN echo "upstream php-upstream { server ${PHP_UPSTREAM_CONTAINER}:${PHP_UPSTREAM_PORT}; }" > /etc/nginx/conf.d/upstream.conf \
     && rm /etc/nginx/conf.d/default.conf
 
-ADD ./startup.sh /opt/startup.sh
+COPY nginx/startup.sh /opt/startup.sh
 RUN sed -i 's/\r//g' /opt/startup.sh
+
+# Add InvoicePlane banner to bash profile
+COPY invoiceplane-banner.sh /root/invoiceplane-banner.sh
+RUN sed -i 's/\r//g' /root/invoiceplane-banner.sh && \
+    chmod +x /root/invoiceplane-banner.sh && \
+    echo "" >> /root/.bashrc && \
+    echo "# Set container type for banner" >> /root/.bashrc && \
+    echo "export CONTAINER_TYPE='Nginx Container'" >> /root/.bashrc && \
+    echo "# Load InvoicePlane Banner" >> /root/.bashrc && \
+    echo "if [ -f ~/invoiceplane-banner.sh ]; then" >> /root/.bashrc && \
+    echo "    source ~/invoiceplane-banner.sh" >> /root/.bashrc && \
+    echo "fi" >> /root/.bashrc && \
+    # Also add banner for www-data user \
+    mkdir -p /home/www-data && \
+    cp /root/invoiceplane-banner.sh /home/www-data/invoiceplane-banner.sh && \
+    chown www-data:www-data /home/www-data/invoiceplane-banner.sh && \
+    chmod +x /home/www-data/invoiceplane-banner.sh && \
+    touch /home/www-data/.bashrc && \
+    chown www-data:www-data /home/www-data/.bashrc && \
+    echo "" >> /home/www-data/.bashrc && \
+    echo "# Set container type for banner" >> /home/www-data/.bashrc && \
+    echo "export CONTAINER_TYPE='Nginx Container'" >> /home/www-data/.bashrc && \
+    echo "# Load InvoicePlane Banner" >> /home/www-data/.bashrc && \
+    echo "if [ -f ~/invoiceplane-banner.sh ]; then" >> /home/www-data/.bashrc && \
+    echo "    source ~/invoiceplane-banner.sh" >> /home/www-data/.bashrc && \
+    echo "fi" >> /home/www-data/.bashrc
+
 CMD ["/bin/bash", "/opt/startup.sh"]
 
 EXPOSE 80 81 443