From 89f6f02d1f7754c1df99f34a61124a90a6cbc54a Mon Sep 17 00:00:00 2001 From: Darko Gjorgjijoski Date: Tue, 30 Jan 2024 07:49:00 +0200 Subject: [PATCH] Move docker to a separate repository --- .dockerignore | 10 -------- .gitignore | 1 - docker/Dockerfile | 51 -------------------------------------- docker/cron.dockerfile | 10 -------- docker/crontab | 1 - docker/docker-compose.yml | 52 --------------------------------------- docker/nginx.Dockerfile | 5 ---- docker/nginx/nginx.conf | 22 ----------------- docker/php/uploads.ini | 4 --- readme.md | 2 ++ 10 files changed, 2 insertions(+), 156 deletions(-) delete mode 100644 .dockerignore delete mode 100644 docker/Dockerfile delete mode 100644 docker/cron.dockerfile delete mode 100644 docker/crontab delete mode 100644 docker/docker-compose.yml delete mode 100644 docker/nginx.Dockerfile delete mode 100644 docker/nginx/nginx.conf delete mode 100644 docker/php/uploads.ini diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 1cf15ae2..00000000 --- a/.dockerignore +++ /dev/null @@ -1,10 +0,0 @@ -.dockerignore -.gitignore -*.md -.git/ -.idea/ -.DS_Store/ -docker-compose.* -LICENSE -nginx.conf -yarn.lock diff --git a/.gitignore b/.gitignore index 708e45ca..62b7e231 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ Homestead.yaml .rnd /.expo /.vscode -/docker-compose/db/data/ .gitkeep /public/docs /.scribe diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 7c2d9018..00000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -FROM php:8.1-fpm-bookworm - -ENV user=invoiceshelf-user -ENV uid=1000 - -# Install system dependencies -RUN apt-get update && apt-get install -y \ - git \ - curl \ - libpng-dev \ - libonig-dev \ - libxml2-dev \ - zip \ - unzip \ - libzip-dev \ - libmagickwand-dev \ - nano \ - mariadb-client - -# Clear cache -RUN apt-get clean && rm -rf /var/lib/apt/lists/* - -RUN pecl install imagick \ - && docker-php-ext-enable imagick - -# Install PHP extensions -RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd - -# Get latest Composer -COPY --from=composer:latest /usr/bin/composer /usr/bin/composer - -# Create system user to run Composer and Artisan Commands -RUN useradd -G www-data,root -u $uid -d /home/$user $user -RUN mkdir -p /home/$user/.composer && \ - chown -R $user:$user /home/$user - -COPY . /var/www/ -COPY docker/php/uploads.ini /usr/local/etc/php/conf.d/uploads.ini -RUN cp /var/www/.env.example /var/www/.env -RUN chown -R $user:$user /var/www/ -RUN chmod -R 775 /var/www/storage -RUN chmod -R 775 /var/www/bootstrap - -# Set working directory -WORKDIR /var/www - -RUN composer install --no-interaction --prefer-dist --optimize-autoloader -RUN php artisan key:generate -RUN php artisan storage:link || true - -USER $user diff --git a/docker/cron.dockerfile b/docker/cron.dockerfile deleted file mode 100644 index 3dc21ee2..00000000 --- a/docker/cron.dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM php:8.1-fpm-bookworm - -RUN apt update && apt install -y cron - -RUN docker-php-ext-install pdo pdo_mysql bcmath - -COPY docker/crontab /etc/crontabs/root -RUN crontab /etc/crontabs/root - -CMD ["/usr/sbin/cron", "-f"] diff --git a/docker/crontab b/docker/crontab deleted file mode 100644 index 777a48eb..00000000 --- a/docker/crontab +++ /dev/null @@ -1 +0,0 @@ -* * * * * cd /var/www && php artisan schedule:run >> /dev/stdout 2>&1 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml deleted file mode 100644 index 289c2c82..00000000 --- a/docker/docker-compose.yml +++ /dev/null @@ -1,52 +0,0 @@ -version: '3' - -services: - app: - image: invoiceshelf/invoiceshelf-php - restart: unless-stopped - working_dir: /var/www/ - networks: - - invoiceshelf - - db: - image: mariadb:lts - restart: always - volumes: - - db:/var/lib/mysql - # If you want to persist data on the host, comment the line above this one... - # and uncomment the line under this one. - #- ./docker-compose/db/data:/var/lib/mysql:rw,delegated - environment: - MYSQL_USER: invoiceshelf - MYSQL_PASSWORD: invoiceshelf - MYSQL_DATABASE: invoiceshelf - MYSQL_ROOT_PASSWORD: invoiceshelf - ports: - - '33006:3306' - networks: - - invoiceshelf - - nginx: - image: invoiceshelf/invoiceshelf-nginx - restart: unless-stopped - ports: - - 80:80 - networks: - - invoiceshelf - - cron: - build: - context: ../ - dockerfile: docker/cron.dockerfile - image: invoiceshelf-cron - volumes: - - ../:/var/www - networks: - - invoiceshelf - -volumes: - db: - -networks: - invoiceshelf: - driver: bridge diff --git a/docker/nginx.Dockerfile b/docker/nginx.Dockerfile deleted file mode 100644 index ef1e186c..00000000 --- a/docker/nginx.Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM nginx:1.20-alpine - -COPY docker/nginx /etc/nginx/conf.d/ -RUN rm /etc/nginx/conf.d/default.conf -COPY public/ /var/www/public/ diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf deleted file mode 100644 index d9b28d8a..00000000 --- a/docker/nginx/nginx.conf +++ /dev/null @@ -1,22 +0,0 @@ -server { - client_max_body_size 64M; - listen 80; - index index.php index.html; - error_log /var/log/nginx/error.log; - access_log /var/log/nginx/access.log; - root /var/www/public; - location ~ \.php$ { - try_files $uri =404; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass app:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_read_timeout 300; - } - location / { - try_files $uri $uri/ /index.php$is_args$query_string; - gzip_static on; - } -} diff --git a/docker/php/uploads.ini b/docker/php/uploads.ini deleted file mode 100644 index 293cde9e..00000000 --- a/docker/php/uploads.ini +++ /dev/null @@ -1,4 +0,0 @@ -file_uploads = On -upload_max_filesize = 64M -post_max_size = 64M -max_execution_time = 300 diff --git a/readme.md b/readme.md index f76fa6a7..bb1214ec 100644 --- a/readme.md +++ b/readme.md @@ -8,6 +8,8 @@ InvoiceShelf is a fork of [Crater](https://crater.finance) that focuses in stabi The Web Application is made using Laravel & VueJS while the Mobile Apps are built using React Native. +**NOTE:** The docker image files are moved into a separate repository [InvoiceShelf/docker](https://github.com/InvoiceShelf/docker). + # Table of Contents 1. [Documentation](#documentation)