diff --git a/Seed.php b/Seed.php new file mode 100644 index 0000000..e69de29 diff --git a/compose.yaml b/compose.yaml index 023bdb7..9594bb3 100644 --- a/compose.yaml +++ b/compose.yaml @@ -9,7 +9,7 @@ services: depends_on: - database ports: - - ${SETUP_APP_PORT:-80}:80 + - 127.0.0.1:${SETUP_APP_PORT:-80}:80 user: ${dockerUID}:${dockerGID} # Database database: @@ -22,8 +22,6 @@ services: MYSQL_PASSWORD: ${DB_PASSWORD} MYSQL_USER: ${DB_USERNAME} MYSQL_PORT: ${DB_PORT} - ports: - - "33061:3306" user: ${dockerUID}:${dockerGID} # Database management pma: diff --git a/docker_build/Dockerfile b/docker_build/Dockerfile index 01b8787..6e1b2bb 100644 --- a/docker_build/Dockerfile +++ b/docker_build/Dockerfile @@ -22,4 +22,4 @@ RUN apt-get update \ && apt-get autoclean -y \ && rm -rf /var/lib/apt/lists/* -CMD php spark serve --port 80 --host 0.0.0.0 +CMD ["php", "spark", "serve", "--port", "80", "--host", "0.0.0.0"] diff --git a/env_docker b/env_docker index 438970f..8d63de6 100644 --- a/env_docker +++ b/env_docker @@ -13,5 +13,5 @@ database.default.DBDriver = MySQLi database.default.port = 3306 CI_ENVIRONMENT = development -SETUP_APP_PORT=80 +SETUP_APP_PORT=8080 SETUP_PMA_PORT=8888 diff --git a/setup b/setup index bc2ae6b..cefd83c 100755 --- a/setup +++ b/setup @@ -18,11 +18,12 @@ mkdir dbdata &> /dev/null mkdir igniter &> /dev/null echo "Container build in progress.." -composer_docker_hash=$(docker build -q docker_build) +docker build -q docker_build -t script_igniter if [ ! -f igniter/composer.json ]; then - docker run --user $dockerUID:$dockerGID --rm -v ./igniter:/app -it $composer_docker_hash composer create-project codeigniter4/appstarter tmp + docker run --user $dockerUID:$dockerGID --rm -v ./igniter:/app -it script_igniter composer create-project codeigniter4/appstarter tmp mv igniter/tmp/* igniter mv igniter/tmp/.* igniter + rmdir igniter/tmp fi if [ ! -f igniter/.gitignore ]; then @@ -43,7 +44,7 @@ for executable in start stop setup exec spark-exec switch-branch-migrate; do ln -sf ../$executable igniter/$executable done -docker run --user $dockerUID:$dockerGID --rm -v ./igniter:/app -it $composer_docker_hash composer install +docker run --user $dockerUID:$dockerGID --rm -v ./igniter:/app -it script_igniter composer install cp env_docker .env cp env_docker igniter/.env echo "dockerUID=$dockerUID" >> .env diff --git a/stop b/stop index e2727ca..5f909cb 100755 --- a/stop +++ b/stop @@ -1,9 +1,9 @@ #!/bin/bash -if [[ "$(basename $(pwd))" == "laravel" ]]; then +if [[ "$(basename $(pwd))" == "igniter" ]]; then cd .. ./stop - cd laravel + cd igniter exit fi diff --git a/switch-branch-migrate b/switch-branch-migrate index d4ae275..eec3d70 100755 --- a/switch-branch-migrate +++ b/switch-branch-migrate @@ -19,4 +19,8 @@ fi cd .. -docker compose exec app php spark # migrate +seeds=$(ls igniter/Seeds) + +docker compose exec app php spark migrate +docker compose exec app php spark db:seed App &> /dev/null +