From a84ed177e83b270c68e70e0c2ee48f7286d7b4d4 Mon Sep 17 00:00:00 2001 From: Yannick Date: Wed, 9 Apr 2025 14:18:19 +0200 Subject: [PATCH] add database support --- docker_build/Dockerfile | 8 ++++---- env_docker | 7 +++++++ igniter/.gitignore | 1 + setup | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/docker_build/Dockerfile b/docker_build/Dockerfile index b0f7289..db3129b 100644 --- a/docker_build/Dockerfile +++ b/docker_build/Dockerfile @@ -12,15 +12,15 @@ COPY . . RUN apt-get update \ && apt-get install -y \ libicu-dev libzip-dev \ - && docker-php-ext-enable opcache \ - && docker-php-ext-install pdo_mysql intl zip -j$(nproc) \ + && docker-php-ext-install mysqli pdo pdo_mysql intl zip -j$(nproc) \ + && docker-php-ext-enable opcache mysqli \ && apt-get autoclean -y \ && rm -rf /var/lib/apt/lists/* RUN apt-get update \ && apt-get install -y "$(cat add_pkgs | head -n 1)" || true \ - && docker-php-ext-enable "$(cat enable_ext | head -n 1)" || true \ - && docker-php-ext-enable "$(cat install_ext | head -n 1)" || true \ + && docker-php-ext-install "$(cat install_ext | head -n 1)" || true \ + && docker-php-ext-enable "$(cat enable_ext | head -n 0)" || true \ && apt-get autoclean -y \ && rm -rf /var/lib/apt/lists/* diff --git a/env_docker b/env_docker index 17037a2..c722e88 100644 --- a/env_docker +++ b/env_docker @@ -5,5 +5,12 @@ DB_DATABASE=igniter DB_USERNAME=igniter-user DB_PASSWORD=igniter-password +database.default.hostname = database +database.default.database = igniter +database.default.username = igniter-user +database.default.password = igniter-password +database.default.DBDriver = MySQLi +database.default.port = 3306 + SETUP_APP_PORT=80 SETUP_PMA_PORT=8888 diff --git a/igniter/.gitignore b/igniter/.gitignore index a129302..8b1b14a 100644 --- a/igniter/.gitignore +++ b/igniter/.gitignore @@ -124,6 +124,7 @@ nb-configuration.xml /results/ /phpunit*.xml +# Codeigniter Setup Script start stop setup diff --git a/setup b/setup index 8a6c23f..bc2ae6b 100755 --- a/setup +++ b/setup @@ -45,6 +45,7 @@ done docker run --user $dockerUID:$dockerGID --rm -v ./igniter:/app -it $composer_docker_hash composer install cp env_docker .env +cp env_docker igniter/.env echo "dockerUID=$dockerUID" >> .env echo "dockerGID=$dockerGID" >> .env