test deploy

.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
 ...

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

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

devops/gitlab/merge_requests/build/1_build.yml

@@ -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"
-...

devops/gitlab/release/1_release-tag.yml

@@ -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"
-...

devops/gitlab/release/2_deploy.yml

@@ -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
-...

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

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