From e5024355242035bdf56e977f2b1393708b1c2d35 Mon Sep 17 00:00:00 2001 From: farid Date: Mon, 28 Mar 2022 08:45:41 +0430 Subject: [PATCH] feat: update Dockerfile structure and minor change in drone file --- .drone.yml | 2 +- Dockerfile | 35 ++--------------------------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/.drone.yml b/.drone.yml index 03e1b40..4037b2a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ steps: - name: build to production commands: - sudo cp /home/administrator/apps/willaengine/composer-prod.json . - - docker build -t registry.willaspace.com/willaspace/willaengine:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . + - docker build -t registry.willaspace.com/willaspace/willaengine:latest --build-arg COMPOSER_FILE_NAME=composer-prod . when: branch: - master diff --git a/Dockerfile b/Dockerfile index 5e5361e..56a8d6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,35 +1,4 @@ -FROM dfs1368/laravel-php-fpm:7.4 - -ARG ssh_prv_key - -WORKDIR /var/www - -RUN apt install -y sendmail openssh-server libpng-dev - -# Authorize SSH Host -RUN mkdir -p /root/.ssh && \ - chmod 0700 /root/.ssh && \ - echo "$ssh_prv_key" > /root/.ssh/id_rsa && \ - ssh-keyscan git.willaspace.com > /root/.ssh/known_hosts && \ - chmod 600 /root/.ssh/id_rsa - -RUN docker-php-ext-install gd - -RUN printf 'upload_max_filesize=300M;\npost_max_size=300M;\nmax_execution_time=600;\nmax_input_time=600;\n' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini; -RUN echo 'pm.max_children = 100' >> /usr/local/etc/php-fpm.d/zz-docker.conf - -COPY database /var/www/database - -COPY composer-prod.* /var/www/ - -RUN composer clearcache && COMPOSER=composer-prod.json composer install --no-scripts - -COPY . /var/www +FROM fsaravi/standard-laravel:7.4 +WORKDIR /var/www/html RUN php artisan morphmap:cache - -RUN chown -R www-data:www-data \ - /var/www/public \ - /var/www/storage \ - /var/www/bootstrap/cache -