From 3beba5e99b082905c05352bf5c67200ac079ef74 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Sun, 3 Oct 2021 14:24:44 +0300 Subject: [PATCH] test deploy --- .gitlab-ci.yml | 9 +++++--- Makefile | 2 +- devops/docker/php/Dockerfile | 2 +- .../gitlab/merge_requests/build/1_build.yml | 22 ------------------- devops/gitlab/release/1_release-tag.yml | 22 ------------------- devops/gitlab/release/2_deploy.yml | 15 ------------- docker-compose-local.yml | 8 ++----- docker-compose.yml | 10 ++++----- 8 files changed, 14 insertions(+), 76 deletions(-) delete mode 100644 devops/gitlab/merge_requests/build/1_build.yml delete mode 100644 devops/gitlab/release/1_release-tag.yml delete mode 100644 devops/gitlab/release/2_deploy.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07cd8a7..1635142 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,12 @@ --- +variables: + DOCKER_BUILD_TEST_BUILD_FILE: devops/docker/php/Dockerfile + DOCKER_BUILD_TEST_TARGET: test + DOCKER_RELEASE_BUILD_FILE: devops/docker/php/Dockerfile + DOCKER_RELEASE_BUILD_TARGET: test + include: - project: infra/kernel/ci-templates ref: master file: /${CI_PROJECT_PATH}.yml - - local: /devops/gitlab/merge_requests/build/1_build.yml - - local: /devops/gitlab/release/1_release-tag.yml - - local: /devops/gitlab/release/2_deploy.yml ... diff --git a/Makefile b/Makefile index ca66b56..8ddb60c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ MAKEFLAGS += --silent restart-local: docker-compose -f docker-compose-local.yml pull docker-compose -f docker-compose-local.yml down - docker-compose -f docker-compose-local.yml up -d + docker-compose -f docker-compose-local.yml up -d --build restart: docker-compose -f docker-compose.yml pull diff --git a/devops/docker/php/Dockerfile b/devops/docker/php/Dockerfile index 43a7100..7cd1273 100644 --- a/devops/docker/php/Dockerfile +++ b/devops/docker/php/Dockerfile @@ -22,7 +22,7 @@ RUN curl --proto =https --tlsv1.2 "https://pecl.php.net/get/xdebug-${XDEBUG_VERS docker-php-ext-enable xdebug COPY devops/docker/php/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini COPY env/app/app.env-dist .env -RUN composer install +RUN composer install --no-interaction --optimize-autoloader FROM test AS local diff --git a/devops/gitlab/merge_requests/build/1_build.yml b/devops/gitlab/merge_requests/build/1_build.yml deleted file mode 100644 index f036b84..0000000 --- a/devops/gitlab/merge_requests/build/1_build.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -build-test: - stage: build-test - only: - - merge_requests - tags: - - docker - image: docker - services: - - name: docker:dind - alias: dockerhost - before_script: - - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin "$DOCKER_URL" - script: - - | - docker build --file devops/docker/php/Dockerfile \ - --tag "$PROJECT_IMAGE_TEST" \ - --target=test . - - docker push "$PROJECT_IMAGE_TEST" - after_script: - - docker logout "$DOCKER_URL" -... diff --git a/devops/gitlab/release/1_release-tag.yml b/devops/gitlab/release/1_release-tag.yml deleted file mode 100644 index 280523b..0000000 --- a/devops/gitlab/release/1_release-tag.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -release-tag: - stage: release-tag - only: - - tags - tags: - - docker - image: docker - services: - - name: docker:dind - alias: dockerhost - before_script: - - echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin "$DOCKER_URL" - script: - - | - docker build --file devops/docker/php/Dockerfile \ - --tag ${PROJECT_IMAGE}:latest \ - --target=test . - - docker push ${PROJECT_IMAGE}:latest - after_script: - - docker logout "$DOCKER_URL" -... diff --git a/devops/gitlab/release/2_deploy.yml b/devops/gitlab/release/2_deploy.yml deleted file mode 100644 index 5275c6d..0000000 --- a/devops/gitlab/release/2_deploy.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -deploy: - stage: deploy - only: - - tags - tags: - - ssh-1.160 - variables: - GIT_STRATEGY: none - script: - - cd /home/fedy95/gitlab/${CI_PROJECT_PATH} - - git pull - - make restart - - make cleanup -... diff --git a/docker-compose-local.yml b/docker-compose-local.yml index 5250c11..9c2a0a3 100644 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -7,23 +7,19 @@ services: context: . dockerfile: devops/docker/php/Dockerfile target: local - restart: unless-stopped + restart: always - env_file: - - env/app/app.env environment: COMPOSER_MEMORY_LIMIT: "-1" PHP_IDE_CONFIG: "serverName=notification-provider_php" volumes: - ./app:/var/www/localhost - - ${HOME}/.composer:${HOME}/.composer - - ${HOME}/.ssh:${HOME}/.ssh expose: - "9000" nginx: image: nginx:1.21-alpine - restart: unless-stopped + restart: always depends_on: - app diff --git a/docker-compose.yml b/docker-compose.yml index 8795047..e579f92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,18 +4,16 @@ version: "3.4" services: app: image: registry.fedy95.com/dev-notification-provider:latest - restart: unless-stopped + restart: always - env_file: - - env/app/app.env - environment: - COMPOSER_MEMORY_LIMIT: "-1" + volumes: + - ./env/app/app.env:/var/www/localhost/.env expose: - "9000" nginx: image: nginx:1.21-alpine - restart: unless-stopped + restart: always depends_on: - app