diff --git a/app/Http/Requests/Netbien/PackagesStoreRequest.php b/app/Http/Requests/Netbien/PackagesStoreRequest.php index 3ee6b81..fc8ddad 100644 --- a/app/Http/Requests/Netbien/PackagesStoreRequest.php +++ b/app/Http/Requests/Netbien/PackagesStoreRequest.php @@ -26,8 +26,8 @@ public function rules(): array { return [ 'name' => ['required', 'string', 'max:80'], - 'price' => ['required', 'float'], - 'period' => ['required', 'float'], + 'price' => ['required', 'integer'], + 'period' => ['required', 'integer'], 'data_limit' => ['required', 'integer'], ]; } diff --git a/docker-compose.yml b/docker-compose.yml index 073d101..eda8317 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,14 +17,16 @@ services: networks: - netbien-network mem_limit: 512m - depends_on: - mysql: - condition: service_healthy + extra_hosts: + - "host.docker.internal:host-gateway" +# depends_on: +# mysql: +# condition: service_healthy nginx: image: nginx:alpine ports: - - "${NGINX_PORT:-8080}:80" + - "${NGINX_PORT}:80" volumes: - ./:/var/www/netbien - ./Docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf @@ -34,37 +36,37 @@ services: depends_on: - netbien-backend - mysql: - image: mysql:8.0 - environment: - MYSQL_DATABASE: ${DB_DATABASE} - MYSQL_ROOT_PASSWORD: ${DB_PASSWORD} - MYSQL_PASSWORD: ${DB_PASSWORD} - MYSQL_USER: ${DB_USERNAME} - ports: - - "${DB_PORT:-3306}:3306" - volumes: - - mysql_data:/var/lib/mysql - networks: - - netbien-network - mem_limit: 512m - healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] - timeout: 15s - retries: 10 +# mysql: +# image: mysql:8.0 +# environment: +# MYSQL_DATABASE: ${DB_DATABASE} +# MYSQL_ROOT_PASSWORD: ${DB_PASSWORD} +# MYSQL_PASSWORD: ${DB_PASSWORD} +# MYSQL_USER: ${DB_USERNAME} +# ports: +# - "${DB_PORT}:3306" +# volumes: +# - mysql_data:/var/lib/mysql +# networks: +# - netbien-network +# mem_limit: 512m +# healthcheck: +# test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] +# timeout: 15s +# retries: 10 - phpmyadmin: - image: phpmyadmin/phpmyadmin - environment: - PMA_HOST: mysql - PMA_PORT: 3306 - ports: - - "${PMA_PORT:-8081}:80" - depends_on: - - mysql - networks: - - netbien-network - mem_limit: 512m +# phpmyadmin: +# image: phpmyadmin/phpmyadmin +# environment: +# PMA_HOST: mysql +# PMA_PORT: 3306 +# ports: +# - "${PMA_PORT}:80" +# depends_on: +# - mysql +# networks: +# - netbien-network +# mem_limit: 512m volumes: mysql_data: diff --git a/entrypoint-dev.sh b/entrypoint-dev.sh index 932cb96..0729c6b 100644 --- a/entrypoint-dev.sh +++ b/entrypoint-dev.sh @@ -1,15 +1,15 @@ #!/bin/bash set -e -git config --global --add safe.directory /var/www/repuve-v1 +git config --global --add safe.directory /var/www/netbien echo "=== Iniciando entrypoint DESARROLLO ===" # Variables desde Docker environment -DB_HOST=${DB_HOST:-mysql} -DB_USERNAME=${DB_USERNAME:-root} -DB_PASSWORD=${DB_PASSWORD:-} -DB_DATABASE=${DB_DATABASE:-laravel} +DB_HOST=${DB_HOST} +DB_USERNAME=${DB_USERNAME} +DB_PASSWORD=${DB_PASSWORD} +DB_DATABASE=${DB_DATABASE} MAX_RETRIES=30 RETRY_COUNT=0