diff --git a/docker-compose-desarrollo.yml b/docker-compose-desarrollo.yml deleted file mode 100644 index 837e785..0000000 --- a/docker-compose-desarrollo.yml +++ /dev/null @@ -1,35 +0,0 @@ -services: - ddjj: - build: - context: . - dockerfile: Dockerfile - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./src/app/:/var/www/ddjj/app:rw - - ./src/config/:/var/www/ddjj/config:rw - - ./src/database/:/var/www/ddjj/database:rw - - ./src/public/:/var/www/ddjj/public:rw - - ./src/resources/:/var/www/ddjj/resources:rw - - ./src/routes/:/var/www/ddjj/routes:rw - - ./src/tests/:/var/www/ddjj/tests:rw - - ./src/composer.json/:/var/www/ddjj/composer.json - - ./src/composer.lock/:/var/www/ddjj/composer.lock - - ./src/.env:/var/www/ddjj/.env - depends_on: - - pgsql - ports: - - 5556:80 - - 5557:443 - restart: always - - pgsql: - image: postgres:11.6 - ports: - - 5555:5432 - environment: - TZ: America/Argentina/Buenos_Aires - POSTGRES_PASSWORD: postgres - POSTGRES_DB: ddjj - PGDATA: /var/lib/postgresql/data/pgdata - restart: always diff --git a/src/docker-compose.yml b/src/docker-compose.yml new file mode 100644 index 0000000..63fd61b --- /dev/null +++ b/src/docker-compose.yml @@ -0,0 +1,56 @@ +services: + laravel.test: + build: + context: ./vendor/laravel/sail/runtimes/8.4 + dockerfile: Dockerfile + args: + WWWGROUP: '${WWWGROUP}' + image: sail-8.4/app + extra_hosts: + - 'host.docker.internal:host-gateway' + ports: + - '${APP_PORT:-80}:80' + - '${VITE_PORT:-5173}:${VITE_PORT:-5173}' + environment: + WWWUSER: '${WWWUSER}' + LARAVEL_SAIL: 1 + XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}' + XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}' + IGNITION_LOCAL_SITES_PATH: '${PWD}' + volumes: + - '.:/var/www/html' + networks: + - sail + depends_on: + - pgsql + pgsql: + image: 'postgres:17' + ports: + - '${FORWARD_DB_PORT:-5432}:5432' + environment: + PGPASSWORD: '${DB_PASSWORD:-secret}' + POSTGRES_DB: '${DB_DATABASE}' + POSTGRES_USER: '${DB_USERNAME}' + POSTGRES_PASSWORD: '${DB_PASSWORD:-secret}' + volumes: + - 'sail-pgsql:/var/lib/postgresql/data' + - './vendor/laravel/sail/database/pgsql/create-testing-database.sql:/docker-entrypoint-initdb.d/10-create-testing-database.sql' + networks: + - sail + healthcheck: + test: + - CMD + - pg_isready + - '-q' + - '-d' + - '${DB_DATABASE}' + - '-U' + - '${DB_USERNAME}' + retries: 3 + timeout: 5s +networks: + sail: + driver: bridge +volumes: + sail-pgsql: + driver: local diff --git a/src/phpunit.xml b/src/phpunit.xml index eb13aff..9d487a9 100644 --- a/src/phpunit.xml +++ b/src/phpunit.xml @@ -21,8 +21,7 @@ - - +