Treewide: Docker: Introduce Minio S3 Object Storage !

Signed-off-by: Dicky Herlambang (花） <[email protected]>

Author: Nicklas373

Dockerfile/Dockerfile.hana-api-services.sit

@@ -24,25 +24,30 @@ RUN apk add --no-cache \
     curl \
     unzip \
     git \
-    imagemagick-dev \
     libzip-dev \
     freetype-dev \
+    imagemagick-dev \
     libjpeg-turbo-dev \
     libpng-dev \
     ghostscript \
     python3 \
     py3-pip \
-    postgresql-dev \
     autoconf \
     build-base \
-    libsodium-dev
+    postgresql-dev \
+    libsodium-dev \
+    supervisor \
+    nginx \
+    bash \
+    busybox-suid \
+    nano
 
 # Install PHP extensions
 RUN docker-php-ext-configure gd --with-freetype --with-jpeg && \
     docker-php-ext-install -j$(nproc) gd zip pdo_pgsql ftp sodium
 
 # Install Imagick extension
-RUN curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
+RUN cd /tmp && curl -L -o /tmp/imagick.tar.gz https://pecl.php.net/get/imagick-3.7.0.tgz \
     && tar --strip-components=1 -xf /tmp/imagick.tar.gz \
     && phpize \
     && ./configure \
@@ -57,27 +62,28 @@ RUN pip3 install --upgrade pip && pip3 install requests
 
 # Clone App Services
 RUN git clone -b dev/be/master https://github.com/Nicklas373/Hana-PDF hanaci-api
-RUN chown -R www-data:www-data hanaci-api
 
 # Configure Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 RUN cd hanaci-api && composer install --no-interaction --no-scripts --no-progress --prefer-dist
 
 # Configure App Service
 COPY module/php/php.ini /usr/local/etc/php/conf.d/99-hana.ini
-RUN mkdir -p hanaci-api/storage/app/public/batch
-RUN mkdir -p hanaci-api/storage/app/public/download
-RUN mkdir -p hanaci-api/storage/app/public/image
-RUN mkdir -p hanaci-api/storage/app/public/pool
-RUN mkdir -p hanaci-api/storage/app/public/upload
+RUN cd hanaci-api && \
+    mkdir -p hanaci-api/storage/app/public/batch && \
+    mkdir -p hanaci-api/storage/app/public/download && \
+    mkdir -p hanaci-api/storage/app/public/image && \
+    mkdir -p hanaci-api/storage/app/public/pool && \
+    mkdir -p hanaci-api/storage/app/public/upload
+RUN cd hanaci-api && cp .env.example .env
+RUN cd hanaci-api && \
+    php artisan key:generate --no-interaction --quiet && \
+    php artisan jwt:secret --no-interaction --quiet && \
+    php artisan storage:link --no-interaction --quiet && \
+    php artisan config:cache --quiet && \
+    php artisan config:clear --quiet
 RUN cd hanaci-api && chmod o+w /var/www/html/hanaci-api/storage/ -R
 RUN cd hanaci-api && chmod o+w /var/www/html/hanaci-api/vendor/mpdf/mpdf/tmp/ -R
-RUN cd hanaci-api && cp .env.example .env
-RUN cd hanaci-api && php artisan key:generate
-RUN cd hanaci-api && php artisan jwt:secret
-RUN cd hanaci-api && php artisan storage:link
-RUN cd hanaci-api && php artisan config:cache
-RUN cd hanaci-api && php artisan config:clear
 
 # Configure Laravel Env
 RUN cd hanaci-api && echo "" >> .env
@@ -107,8 +113,26 @@ RUN cd hanaci-api && echo "TELEGRAM_BOT_ID=xxxx" >> .env
 RUN cd hanaci-api && echo "TELEGRAM_CHAT_ID=xxxx" >> .env
 RUN cd hanaci-api && echo "HANA_UNIQUE_KEY=xxxx" >> .env
 
-# Expose port 9000
-EXPOSE 9000
+# Configure permission
+RUN cd hanaci-api && \
+    chmod o+w /var/www/html/hanaci-api/storage/ -R && \
+    chmod o+w /var/www/html/hanaci-api/vendor/mpdf/mpdf/tmp/ -R
+
+# Configure Nginx Services
+RUN mkdir /etc/nginx/sites-enabled
+COPY module/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY module/nginx/sites-available/api-hanaci.conf /etc/nginx/sites-available/api-hanaci.conf
+RUN ln -s /etc/nginx/sites-available/api-hanaci.conf /etc/nginx/sites-enabled/
+
+# Set up cron job for Laravel scheduler
+COPY module/hanaci/hanaci-api/api-cron /etc/crontabs/root
+RUN touch /var/log/cron.log && chmod 0644 /var/log/cron.log
+
+# Configure supervisord
+COPY module/instance/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Expose necessary ports
+EXPOSE 80 9000
 
-# Start PHP FPM
-CMD ["php-fpm"]
+# Start cron, Nginx, and PHP-FPM with supervisord
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

Dockerfile/Dockerfile.hana-app-pdf.sit

@@ -25,26 +25,35 @@ RUN apk add --no-cache \
     unzip \
     git \
     libzip-dev \
-    postgresql-dev
+    libpq-dev \
+    postgresql-dev \
+    supervisor \
+    nginx \
+    bash \
+    busybox-suid \
+    nano
 
 # Install PHP extensions
-RUN docker-php-ext-install zip pdo_pgsql
+RUN docker-php-ext-install -j$(nproc) pdo_pgsql
 
 # Clone App Services
 RUN git clone -b dev/fe/master-live https://github.com/Nicklas373/Hana-PDF hanaci-pdf
-RUN chown -R www-data:www-data hanaci-pdf
 
 # Configure Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 RUN cd hanaci-pdf && composer install --no-interaction --no-scripts --no-progress --prefer-dist
 
 # Configure App Service
 COPY module/php/php.ini /usr/local/etc/php/conf.d/99-hana.ini
-RUN cd hanaci-pdf && chmod o+w /var/www/html/hanaci-pdf/storage/ -R
 RUN cd hanaci-pdf && cp .env.example .env
-RUN cd hanaci-pdf && php artisan key:generate
-RUN cd hanaci-pdf && php artisan config:cache
-RUN cd hanaci-pdf && php artisan config:clear
+RUN cd hanaci-pdf && \
+    php artisan key:generate && \
+    php artisan config:cache && \
+    php artisan config:clear
+
+# Configure permission
+RUN cd hanaci-pdf && \
+    chmod o+w /var/www/html/hanaci-pdf/storage/ -R
 
 # Configure Laravel Env
 RUN cd hanaci-pdf && echo "VITE_ADOBE_CLIENT_ID=xxxx" >> .env
@@ -60,8 +69,21 @@ RUN cd hanaci-pdf && sed -i "s/DB_PASSWORD=/DB_PASSWORD=$DB_PASSWORD/" .env
 RUN cd hanaci-pdf && echo "TELEGRAM_BOT_ID=xxxx" >> .env
 RUN cd hanaci-pdf && echo "TELEGRAM_CHAT_ID=xxxx" >> .env
 
-# Expose port 9000
-EXPOSE 9000
+# Configure nginx instances
+RUN mkdir /etc/nginx/sites-enabled
+COPY module/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY module/nginx/sites-available/pdf-hanaci.conf /etc/nginx/sites-available/pdf-hanaci.conf
+RUN ln -s /etc/nginx/sites-available/pdf-hanaci.conf /etc/nginx/sites-enabled/
+
+# Set up cron job for Laravel scheduler
+COPY module/hanaci/hanaci-pdf/pdf-cron /etc/crontabs/root
+RUN touch /var/log/cron.log && chmod 0644 /var/log/cron.log
+
+# Configure supervisord
+COPY module/instance/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Expose necessary ports
+EXPOSE 81 9000
 
-# Start PHP FPM
-CMD ["php-fpm"]
+# Start Nginx and PHP-FPM with supervisord
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

Dockerfile/Dockerfile.hana-instance-services.sit

@@ -1,12 +1,14 @@
 services:
     hana-app-pdf:
-        image: nicklas373/hana-app-pdf-sit:1.4
+        image: nicklas373/hana-app-pdf-sit:1.5
         container_name: "hana-app-pdf"
         cpus: 2.0
         mem_limit: 512M
         mem_reservation: 256M
         restart: unless-stopped
         working_dir: /var/www/html/hanaci-pdf
+        ports:
+            - "81:81"
         environment:
             - APP_NAME=pdf.hana-ci.com
         volumes:
@@ -15,15 +17,16 @@ services:
             - hana-network
         depends_on:
             - hana-api-services
-            - hana-instance-services
     hana-api-services:
-        image: nicklas373/hana-api-services-sit:1.6
+        image: nicklas373/hana-api-services-sit:1.7
         container_name: "hana-api-services"
         cpus: 2.0
         mem_limit: 512M
         mem_reservation: 256M
         restart: always
         working_dir: /var/www/html/hanaci-api
+        ports:
+            - "80:80"
         environment:
             - APP_NAME=gw.hana-ci.com
         volumes:
@@ -32,7 +35,25 @@ services:
             - hana-network
         depends_on:
             - hana-db-services
-            - hana-instance-services
+    hana-minio:
+        image: minio/minio:latest
+        container_name: "hanaci-minio"
+        cpus: 1.0
+        mem_limit: 512M
+        mem_reservation: 256M
+        restart: unless-stopped
+        ports:
+            - "9000:9000"
+            - "9001:9001"
+        networks:
+            - hana-network
+        volumes:
+            - minio-data:/data
+            - minio-config:/root/.minio
+        environment:
+        MINIO_ROOT_USER: "eureka"
+        MINIO_ROOT_PASSWORD: "eureka"
+        command: server /data --console-address ":9001"
     hana-db-services:
         image: postgres:16.1
         container_name: "hana-db-services"
@@ -45,10 +66,10 @@ services:
         env_file:
             - .env
         environment:
-            PGPASSWORD: "${DB_PASSWORD}"
-            POSTGRES_DB: "${DB_DATABASE}"
-            POSTGRES_USER: "${DB_USERNAME}"
-            POSTGRES_PASSWORD: "${DB_PASSWORD}"
+            PGPASSWORD: "postgres"
+            POSTGRES_DB: "postgres"
+            POSTGRES_USER: "master"
+            POSTGRES_PASSWORD: "postgres"
             PGDATA: /var/lib/postgresql/data/pgdata
         volumes:
             - "hana-db-services:/var/lib/postgresql/data"
@@ -57,37 +78,13 @@ services:
             - hana-network
         depends_on:
             - hana-instance-services
-    hana-instance-services:
-        image: nicklas373/hana-instance-services-sit:1.3
-        container_name: "hana-instance-services"
-        cpus: 2.0
-        mem_limit: 1G
-        mem_reservation: 512M
-        restart: always
-        ports:
-            - "80:80"
-            - "81:81"
-        volumes:
-            - ./module/imagick/policy.xml:/etc/ImageMagick-6/policy.xml
-            - ./module/nginx/nginx.conf:/etc/nginx/nginx.conf
-            - ./module/nginx/sites-available/api-hanaci.conf:/etc/nginx/sites-available/api-hanaci.conf
-            - ./module/nginx/sites-available/pdf-hanaci.conf:/etc/nginx/sites-available/pdf-hanaci.conf
-            - ./module/php/php.ini:/etc/php/8.2/cli/conf.d/99-hana.ini
-            - ./module/php/php.ini:/etc/php/8.2/fpm/conf.d/99-hana.ini
-            - hana-app-pdf:/var/www/html/hanaci-pdf
-            - hana-api-services:/var/www/html/hanaci-api
-            - hana-instance-services:/var/log/supervisor
-        networks:
-            - hana-network
 networks:
     hana-network:
         driver: bridge
 volumes:
     hana-db-services:
         driver: local
-    hana-app-pdf:
-        driver: local
-    hana-api-services:
+    minio-data:
         driver: local
-    hana-instance-services:
+    minio-config:
         driver: local

docker-compose.yml

@@ -2,6 +2,7 @@
 set -e
 
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+    CREATE DATABASE hanaci_pdf;
     CREATE USER eureka WITH PASSWORD 'eureka';
     GRANT USAGE, CREATE ON SCHEMA public TO eureka;
     ANAYLYZE;

module/instance/init-user-db.sh

@@ -1,32 +1,18 @@
 [supervisord]
 nodaemon=true
 user=root
-logfile=/var/log/supervisor/supervisord.log
-pidfile=/var/run/supervisord.pid
-
-[program:cron]
-command=cron -f
-autostart=true
-autorestart=true
-stderr_logfile=/var/log/supervisor/%(program_name)s_stderr.log
-stderr_logfile_maxbytes=10MB
-stdout_logfile=/var/log/supervisor/%(program_name)s_stdout.log
-stdout_logfile_maxbytes=10MB
 
 [program:nginx]
 command=/usr/sbin/nginx -g "daemon off;"
 autostart=true
 autorestart=true
-stderr_logfile=/var/log/supervisor/%(program_name)s_stderr.log
-stderr_logfile_maxbytes=10MB
-stdout_logfile=/var/log/supervisor/%(program_name)s_stdout.log
-stdout_logfile_maxbytes=10MB
 
 [program:php-fpm]
-command=php-fpm8.2 --nodaemonize 
+command=/usr/local/sbin/php-fpm --nodaemonize
+autostart=true
+autorestart=true
+
+[program:cron]
+command=/usr/sbin/crond -f -l 2
 autostart=true
 autorestart=true
-stderr_logfile=/var/log/supervisor/%(program_name)s_stderr.log
-stderr_logfile_maxbytes=10MB
-stdout_logfile=/var/log/supervisor/%(program_name)s_stdout.log
-stdout_logfile_maxbytes=10MB