diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 3a7658d..102f54c 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -27,10 +27,14 @@ jobs: - name: 'Build Docker Resources' run : | echo --- Building and Starting up docker --- - docker compose up -d + docker compose pull + docker compose up -d --no-build sleep 30 echo --- Containers Up --- + - name: Check Containers + run: docker ps + - name: Execute tests (Unit and Feature tests) via PHPUnit/Pest run: docker exec symbiota-laravel-web-1 php artisan test #- name: Run Playwright tests diff --git a/docker-compose.yml b/docker-compose.yml index 80e94ff..384e72b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: args: WWWGROUP: '${WWWGROUP}' MYSQL_CLIENT: mariadb-client - image: 'sail-8.3/app' + image: 'muchquakz/symbiota-laravel:latest' extra_hosts: - 'host.docker.internal:host-gateway' ports: diff --git a/docker/8.3/Dockerfile b/docker/8.3/Dockerfile index 86ffe71..fbbe313 100644 --- a/docker/8.3/Dockerfile +++ b/docker/8.3/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 LABEL maintainer="Taylor Otwell" -ARG WWWGROUP +ARG WWWGROUP=1000 ARG NODE_VERSION=20 ARG MYSQL_CLIENT="mysql-client" ARG POSTGRES_VERSION=15