From 3f4e8b7170f00e3e7443081bd9773c0bad419579 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 16:06:40 +0330 Subject: [PATCH 01/16] add drone ci cofig file --- .drone.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..2193f47 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,24 @@ +kind: pipeline +type: exec +name: default + +steps: +- name: build + commands: + - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" + - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker + +- name: deploy + commands: + - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d + - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" + - docker exec willaengine service cron start + - docker exec willaengine php artisan config:cache + - docker exec willaengine php artisan route:cache + +trigger: + branch: + - master + +environment: + - IMAGE_NAME=willaengine From 63a5bbc143019686bf00dbd510a59156cd71fda6 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 18:23:03 +0330 Subject: [PATCH 02/16] feat:add drone config --- .drone.yml | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2193f47..8d91963 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,23 +2,49 @@ kind: pipeline type: exec name: default +settings: + sh_key: + from_secret: /home/administrator/.ssh/id_rsa + steps: -- name: build - commands: - - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" - - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker + - name: build_production + commands: + - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . + - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker + when: + branch: + - master + + - name: deploy_production + commands: + - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d + - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" + - docker exec willaengine service cron start + - docker exec willaengine php artisan config:cache + - docker exec willaengine php artisan route:cache + when: + branch: + - master + + - name: build_staging + commands: + - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging:latest -f Dockerfile.staging --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . + - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging-nginx:latest -f Dockerfile.nginx . + when: + branch: + - dev -- name: deploy - commands: - - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d - - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - - docker exec willaengine service cron start - - docker exec willaengine php artisan config:cache - - docker exec willaengine php artisan route:cache + - name: deploy_staging + commands: + - cd /apps/${IMAGE_NAME}-staging/ ; docker-compose up -d + when: + branch: + - dev trigger: branch: - - master + - master + - dev environment: - IMAGE_NAME=willaengine From 76c0de6b5ee7a7abc801b211526fe40c44387092 Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 18:24:03 +0330 Subject: [PATCH 03/16] fix --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8d91963..0b1506c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: exec -name: default +name: willaengine settings: sh_key: From 8d8ba19f1cb32029d17e4f8be5a8f6bffd0f846c Mon Sep 17 00:00:00 2001 From: Alireza Azizi Date: Thu, 24 Feb 2022 18:26:13 +0330 Subject: [PATCH 04/16] fix drone settings --- .drone.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0b1506c..97b0cc5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,10 +2,6 @@ kind: pipeline type: exec name: willaengine -settings: - sh_key: - from_secret: /home/administrator/.ssh/id_rsa - steps: - name: build_production commands: From e22211e6e872645ed3c22df4c737592a8453171c Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Thu, 24 Feb 2022 15:35:20 +0000 Subject: [PATCH 05/16] Update '.drone.yml' --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 97b0cc5..ce65af7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,6 @@ steps: - name: build_production commands: - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . - - cd /home/administrator/apps/${IMAGE_NAME}/;sudo ./BuildDocker when: branch: - master From 068e21f8eade6d718e5ec0c5a8297e0934114f36 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Thu, 24 Feb 2022 15:48:31 +0000 Subject: [PATCH 06/16] Update '.drone.yml' --- .drone.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index ce65af7..d4308a0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,16 +1,16 @@ kind: pipeline type: exec -name: willaengine +name: default steps: - - name: build_production + - name: build to production commands: - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . when: branch: - master - - name: deploy_production + - name: deploy to production commands: - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" @@ -21,7 +21,7 @@ steps: branch: - master - - name: build_staging + - name: build to staging commands: - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging:latest -f Dockerfile.staging --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging-nginx:latest -f Dockerfile.nginx . @@ -29,7 +29,7 @@ steps: branch: - dev - - name: deploy_staging + - name: deploy to staging commands: - cd /apps/${IMAGE_NAME}-staging/ ; docker-compose up -d when: From 75557324722476f700e74572a5e6182731c5bfa2 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Thu, 24 Feb 2022 16:16:23 +0000 Subject: [PATCH 07/16] Update '.drone.yml' --- .drone.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index d4308a0..04aed84 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,14 +5,14 @@ name: default steps: - name: build to production commands: - - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . + - docker build -t registry.willaspace.com/willaspace/willaengine:latest . when: branch: - master - name: deploy to production commands: - - cd /home/administrator/apps/${IMAGE_NAME}/ ; docker-compose up -d + - cd /home/administrator/apps/willaengine/ ; docker-compose up -d - docker exec willaengine bash -c "COMPOSER=composer-prod.json composer update" - docker exec willaengine service cron start - docker exec willaengine php artisan config:cache @@ -23,15 +23,15 @@ steps: - name: build to staging commands: - - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging:latest -f Dockerfile.staging --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . - - docker build -t registry.willaspace.com/willaspace/${IMAGE_NAME}-staging-nginx:latest -f Dockerfile.nginx . + - docker build -t registry.willaspace.com/willaspace/willaengine-staging:latest -f Dockerfile.staging . + - docker build -t registry.willaspace.com/willaspace/willaengine-staging-nginx:latest -f Dockerfile.nginx . when: branch: - dev - name: deploy to staging commands: - - cd /apps/${IMAGE_NAME}-staging/ ; docker-compose up -d + - cd /apps/willaengine-staging/ ; docker-compose up -d when: branch: - dev @@ -40,6 +40,3 @@ trigger: branch: - master - dev - -environment: - - IMAGE_NAME=willaengine From 653b1f54b5d30436aa6e776c0186767ac025757d Mon Sep 17 00:00:00 2001 From: Saeid Date: Thu, 24 Feb 2022 20:10:11 +0330 Subject: [PATCH 08/16] fix --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 04aed84..38bd8f8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,6 +5,7 @@ name: default steps: - name: build to production commands: + - sudo cp /home/administrator/apps/willaengine/composer-prod.json . - docker build -t registry.willaspace.com/willaspace/willaengine:latest . when: branch: From 3007508443861ee069a605ea756718ed57fee311 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Tue, 1 Mar 2022 16:25:21 +0000 Subject: [PATCH 09/16] Update 'Dockerfile.staging' --- Dockerfile.staging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.staging b/Dockerfile.staging index 9aa17cf..0ba51b3 100644 --- a/Dockerfile.staging +++ b/Dockerfile.staging @@ -25,7 +25,7 @@ COPY database /var/www/html/database COPY composer-staging.* /var/www/html/ -RUN composer clearcache && COMPOSER=composer-staging.json composer install --no-scripts +RUN COMPOSER=composer-staging.json composer install --no-scripts COPY . /var/www/html From aebb816db53bdf22446cfe35fdd8c622916583c2 Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 2 Mar 2022 16:48:09 +0000 Subject: [PATCH 10/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 38bd8f8..862ce24 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 . + - docker build -t registry.willaspace.com/willaspace/willaengine:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa) . when: branch: - master From cb83460eddbd70aaafd8bc5f31c0b7f0379929ef Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 2 Mar 2022 16:50:54 +0000 Subject: [PATCH 11/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 862ce24..03fa8fe 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 ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" . when: branch: - master From 1c57845c16dcc98004d73f03547bc8cf29b8d75c Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 2 Mar 2022 17:00:15 +0000 Subject: [PATCH 12/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 03fa8fe..edf070d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - name: build to staging commands: - - docker build -t registry.willaspace.com/willaspace/willaengine-staging:latest -f Dockerfile.staging . + - docker build -t registry.willaspace.com/willaspace/willaengine-staging:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" -f Dockerfile.staging . - docker build -t registry.willaspace.com/willaspace/willaengine-staging-nginx:latest -f Dockerfile.nginx . when: branch: From 41e33e9a46d539890258f69ee37ef7fc48bb0eeb Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Thu, 17 Mar 2022 04:15:36 +0000 Subject: [PATCH 13/16] Update 'Dockerfile.staging' --- Dockerfile.staging | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/Dockerfile.staging b/Dockerfile.staging index 0ba51b3..c953bb4 100644 --- a/Dockerfile.staging +++ b/Dockerfile.staging @@ -1,38 +1,6 @@ -FROM dfs1368/laravel-php-fpm:7.4 - -ARG ssh_prv_key +FROM fsaravi/standard-laravel:7.4 WORKDIR /var/www/html - -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 curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \ - apt-get install -y nodejs - -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/html/database - -COPY composer-staging.* /var/www/html/ - -RUN COMPOSER=composer-staging.json composer install --no-scripts - -COPY . /var/www/html - RUN php artisan morphmap:cache -RUN chown -R www-data:www-data \ - /var/www/html/public \ - /var/www/html/storage \ - /var/www/html/bootstrap/cache From 790de962f465304cc4dec199615c31771a3447be Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Thu, 17 Mar 2022 04:18:34 +0000 Subject: [PATCH 14/16] Update '.drone.yml' --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index edf070d..03e1b40 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,7 +24,7 @@ steps: - name: build to staging commands: - - docker build -t registry.willaspace.com/willaspace/willaengine-staging:latest --build-arg ssh_prv_key="$(cat /home/administrator/.ssh/id_rsa)" -f Dockerfile.staging . + - docker build -t registry.willaspace.com/willaspace/willaengine-staging:latest --build-arg COMPOSER_FILE_NAME=composer-staging -f Dockerfile.staging . - docker build -t registry.willaspace.com/willaspace/willaengine-staging-nginx:latest -f Dockerfile.nginx . when: branch: From 8f11c7587c1335455f06ef97123b0d5bceb72189 Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Thu, 17 Mar 2022 04:23:31 +0000 Subject: [PATCH 15/16] Update 'Dockerfile.nginx' --- Dockerfile.nginx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile.nginx b/Dockerfile.nginx index db0a5bb..0c8f42d 100644 --- a/Dockerfile.nginx +++ b/Dockerfile.nginx @@ -1,8 +1,2 @@ -FROM registry.willaspace.com/willaspace/willaengine-staging:latest AS php_builder - -WORKDIR /var/www/html/ -RUN npm install -RUN npm run staging - FROM nginx:1.21.1 -COPY --from=php_builder /var/www/html /var/www/html +COPY public /var/www/html/public From 0583d4c8aff6c648ce8bd47f5198bcba7aa015e3 Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Thu, 17 Mar 2022 04:55:01 +0000 Subject: [PATCH 16/16] Update 'Dockerfile.nginx' --- Dockerfile.nginx | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.nginx b/Dockerfile.nginx index 0c8f42d..40860b1 100644 --- a/Dockerfile.nginx +++ b/Dockerfile.nginx @@ -1,2 +1,3 @@ FROM nginx:1.21.1 + COPY public /var/www/html/public