From de77596b0cdf7e7693c7750db10dc6604f91a5b5 Mon Sep 17 00:00:00 2001 From: George Wainaina Date: Mon, 17 Jun 2024 16:04:20 +0300 Subject: [PATCH 1/5] chore: docker ignore updates --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 07267b56..e38e506d 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,5 @@ system/lan/** !system/lan/turkish.json !system/lan/english.json !system/lan/country.json -*.zip \ No newline at end of file +*.zip +/.vs From f0538db0952ecb4589f7e85d32f2d5a3efef6d93 Mon Sep 17 00:00:00 2001 From: George Wainaina Date: Mon, 17 Jun 2024 16:06:25 +0300 Subject: [PATCH 2/5] fix: fixed exception error occurring in step5 of installation --- install/step5.php | 59 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/install/step5.php b/install/step5.php index bf44338c..5fc1cf97 100644 --- a/install/step5.php +++ b/install/step5.php @@ -13,8 +13,65 @@ - +getMessage(), "\n"; +} +?>
Logo From 3c3d1408d3172eaf99bbb645f9ab36261e9c4e81 Mon Sep 17 00:00:00 2001 From: George Wainaina Date: Mon, 17 Jun 2024 16:10:04 +0300 Subject: [PATCH 3/5] chore: added dockerfile --- Dockerfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..4f5dc05f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +# Use the official PHP image with Apache +FROM php:7.4-apache +EXPOSE 80 +# Install necessary PHP extensions +RUN apt-get update && apt-get install -y \ + libfreetype6-dev \ + libjpeg62-turbo-dev \ + libpng-dev \ + libzip-dev \ + zip \ + unzip \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ + && docker-php-ext-install -j$(nproc) gd \ + && docker-php-ext-install pdo pdo_mysql + +# copy contents into directory +COPY . /var/www/html + +# Set appropriate permissions +RUN chown -R www-data:www-data /var/www/html +RUN chmod -R 755 /var/www/html + +# Set working directory +WORKDIR /var/www/html \ No newline at end of file From 8646453a0ac5cf60bb07a0e9df9a40b00cec39c8 Mon Sep 17 00:00:00 2001 From: George Wainaina Date: Mon, 17 Jun 2024 16:22:17 +0300 Subject: [PATCH 4/5] chore: added docker compose --- docker-compose.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..dfc91601 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,28 @@ +services: + nuxbill: + container_name: nuxbill + pull_policy: always + build: ./ + restart: unless-stopped + ports: + - "80:80" + environment: + TZ: Africa/Nairobi + depends_on: + - mysql + + mysql: + container_name: mysql + image: mysql:8.0 + environment: + MYSQL_ROOT_PASSWORD: "12345678" + MYSQL_DATABASE: "nuxbill" + MYSQL_USER: "nuxbill" + MYSQL_PASSWORD: "12345678" + ports: + - "3306:3306" + volumes: + - mysql_data:/var/lib/mysql + +volumes: + mysql_data: \ No newline at end of file From 973c5e0b093895404732af83b4e3f3e8951e5591 Mon Sep 17 00:00:00 2001 From: George Wainaina Date: Mon, 17 Jun 2024 16:35:21 +0300 Subject: [PATCH 5/5] chore: added zip in dockerfile --- Dockerfile | 4 +++- docker-compose.yml | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f5dc05f..27ff6115 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,14 @@ RUN apt-get update && apt-get install -y \ libfreetype6-dev \ libjpeg62-turbo-dev \ libpng-dev \ + zlib1g-dev \ libzip-dev \ zip \ unzip \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ && docker-php-ext-install -j$(nproc) gd \ - && docker-php-ext-install pdo pdo_mysql + && docker-php-ext-install pdo pdo_mysql \ + && docker-php-ext-install zip # copy contents into directory COPY . /var/www/html diff --git a/docker-compose.yml b/docker-compose.yml index dfc91601..d6bd2619 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,8 +21,10 @@ services: MYSQL_PASSWORD: "12345678" ports: - "3306:3306" - volumes: - - mysql_data:/var/lib/mysql -volumes: - mysql_data: \ No newline at end of file +# skip data persistance (if dev testing) +# volumes: +# - mysql_data:/var/lib/mysql + +# volumes: +# mysql_data: \ No newline at end of file