feat: add migration container and healthchecks for services (#8)

Reviewed-on: #8
Co-authored-by: Ron Rise <ron@siteworxpro.com>
Co-committed-by: Ron Rise <ron@siteworxpro.com>

.dockerignore

@@ -1,2 +1,5 @@
+.idea/
+.DS_Store
 vendor/
 .phpunit.cache/
+tests/

.gitea/workflows/tests.yml

@@ -246,10 +246,23 @@ jobs:
             siteworxpro/composer \
             install --ignore-platform-reqs --no-interaction --prefer-dist --optimize-autoloader
 
-      - name: Run Unit Tests
+      - name: 🧪 ✅ Run Unit Tests
-        run: |
+        uses: addnab/docker-run-action@v3
-          docker run --rm \
+        with:
-            --volumes-from ${{ env.JOB_CONTAINER_NAME }} \
+          username: ${{ secrets.DOCKER_USERNAME }}
-            -w ${{ github.workspace }} \
+          password: ${{ secrets.DOCKER_PASSWORD }}
-            siteworxpro/composer \
+          image: siteworxpro/composer
-            run tests:unit
+          options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} -w ${{ gitea.workspace }}
+          run: |
+            bin/pcov.sh
+            composer run tests:unit:coverage
+
+#      - name: 📦 Publish Build Artifacts
+#        env:
+#          NODE_TLS_REJECT_UNAUTHORIZED: 0
+#        uses: christopherhx/gitea-upload-artifact@v4
+#        with:
+#          options: --volumes-from ${{ env.JOB_CONTAINER_NAME }} -w ${{ gitea.workspace }}
+#          name: junit-coverage.xml
+#          path: tests/reports/junit.xml
+#          retention-days: 1

.gitignore

@@ -1,3 +1,6 @@
 .idea/
+.DS_Store
 vendor/
 .phpunit.cache/
+
+tests/reports/

.gitlab-ci.yml

@@ -1,5 +0,0 @@
-include:
-  - local: .gitlab/ci/stages.yml
-  - local: .gitlab/ci/tests.yml
-  - local: .gitlab/ci/libraries.yml
-

.gitlab/ci/libraries.yml

@@ -1,15 +0,0 @@
-Install Composer Libraries:
-  stage: libraries
-  image: siteworxpro/composer:latest
-  rules:
-    - if: '$CI_COMMIT_TAG'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "push"'
-      when: always
-    - when: never
-  script:
-    - composer install --ignore-platform-reqs
-  artifacts:
-    paths:
-      - vendor/
-    expire_in: 1 hour

.gitlab/ci/stages.yml

@@ -1,3 +0,0 @@
-stages:
-  - libraries
-  - tests

.gitlab/ci/tests.yml

@@ -1,65 +0,0 @@
-Unit Tests:
-  stage: tests
-  needs:
-    - Install Composer Libraries
-  rules:
-    - if: '$CI_COMMIT_TAG'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "push"'
-      when: always
-    - when: never
-  image: siteworxpro/composer
-  before_script: |
-    bin/pcov.sh
-  script: |
-    echo "Running unit tests..."
-    composer run tests:unit:coverage
-  coverage: '/^\s*Lines:\s*\d+.\d+\%/'
-  artifacts:
-    expire_in: 1 day
-    reports:
-      junit: tests/reports/junit.xml
-    paths:
-      - tests/reports/
-
-Run License Check:
-  stage: tests
-  needs:
-    - Install Composer Libraries
-  rules:
-    - if: '$CI_COMMIT_TAG'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "push"'
-      when: on_success
-    - when: never
-  image: siteworxpro/composer
-  script:
-    - composer run tests:license
-
-Run Code Lint:
-  stage: tests
-  needs:
-    - Install Composer Libraries
-  rules:
-    - if: '$CI_COMMIT_TAG'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "push"'
-      when: on_success
-    - when: never
-  image: siteworxpro/composer
-  script:
-    - composer run tests:lint
-
-Run Code Sniffer:
-  stage: tests
-  needs:
-    - Install Composer Libraries
-  rules:
-    - if: '$CI_COMMIT_TAG'
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "push"'
-      when: on_success
-    - when: never
-  image: siteworxpro/composer
-  script:
-    - composer run tests:phpstan

bin/migrate.sh

@@ -0,0 +1,4 @@
+eval #!/bin/sh
+set -e
+
+migrate -path /app/db/migrations -database "postgres://$DB_USERNAME:$DB_PASSWORD@$DB_HOST:$DB_PORT/$DB_DATABASE?sslmode=disable" up

docker-compose.yml

@@ -12,6 +12,24 @@ services:
     environment:
       PHP_IDE_CONFIG: serverName=localhost
 
+  migration-container:
+    volumes:
+      - ./db/migrations:/app/db/migrations
+      - ./bin:/app/bin
+    image: siteworxpro/migrate:v4.18.3
+    working_dir: /app
+#    entrypoint: "/bin/sh -c 'while true; do sleep 30; done;'"
+    entrypoint: /bin/sh -c '/app/bin/migrate.sh'
+    depends_on:
+      postgres:
+        condition: service_healthy
+    environment:
+      DB_USERNAME: ${DB_USERNAME:-siteworxpro}
+      DB_PASSWORD: ${DB_PASSWORD:-password}
+      DB_DATABASE: ${DB_DATABASE:-siteworxpro}
+      DB_HOST: ${DB_HOST-postgres}
+      DB_PORT: ${DB_PORT-5432}
+
   dev-runtime:
     ports:
       - "9501:9501"
@@ -29,6 +47,11 @@ services:
 
   redis:
     image: redis:latest
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     ports:
       - "6379:6379"
     volumes:
@@ -36,6 +59,11 @@ services:
 
   postgres:
     image: postgres:latest
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-siteworxpro}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
     environment:
       POSTGRES_USER: ${DB_USERNAME:-siteworxpro}
       POSTGRES_PASSWORD: ${DB_PASSWORD:-password}

migrations.Dockerfile

@@ -1,5 +1,8 @@
 FROM siteworxpro/migrate:v4.18.3
 
 ADD db/migrations /app/db/migrations
+ADD bin/migrate.sh /app/bin/migrate.sh
 
 WORKDIR /app
+
+ENTRYPOINT ["/app/bin/migrate.sh"]

tests/Controllers/ControllerTest.php

@@ -49,8 +49,6 @@ class ControllerTest extends AbstractController
     }
 }
 
-// @ignore
+class TestClass extends Controller // phpcs:ignore
-class TestClass extends Controller
 {
-
 }

tests/ServiceProviders/AbstractServiceProvider.php

@@ -11,7 +11,6 @@ use Siteworxpro\Tests\Unit;
 
 abstract class AbstractServiceProvider extends Unit
 {
-
     abstract protected function getProviderClass(): string;
 
     /**