mirror of
https://github.com/Yannick7777/codeigniter-setup-script.git
synced 2025-06-25 13:55:32 +02:00
various fixes
This commit is contained in:
parent
e8b8238600
commit
3b2b3eefac
7 changed files with 14 additions and 11 deletions
0
Seed.php
Normal file
0
Seed.php
Normal file
|
@ -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:
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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
|
||||
|
|
7
setup
7
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
|
||||
|
|
4
stop
4
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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue