Merge branch 'master' of git.ale-pri.com:Logisim-Evolution/AWA

This commit is contained in:
Clément
2025-06-10 18:05:09 +02:00
5 changed files with 50 additions and 17 deletions

View File

@@ -1,20 +1,32 @@
all: DOCKER_CONTAINER_NAME=awa-laravel-1
run DOCKER_CMD=docker exec -it $(DOCKER_CONTAINER_NAME)
# Launch the container detached
all:
docker compose up -d
# Launch the container
run: run:
docker compose up docker compose up
init_vendor: # Stop the container
cd laravel && composer i stop:
docker compose down
init:
docker exec -i awa-laravel-1 /scripts/init_laravel.sh
exec_container:
docker exec -i awa-laravel-1 bash
# Stop the container and wipe the database
down: down:
docker compose down -v docker compose down -v
# These tasks need the docker container to be running
exec_container:
$(DOCKER_CMD) bash
seed: seed:
docker exec -i awa-laravel-1 php artisan db:seed --class=$(CLASS) $(DOCKER_CMD) php artisan db:seed --class=$(CLASS)
migrate:
$(DOCKER_CMD) php artisan migrate

View File

@@ -4,3 +4,4 @@ DB_PORT=3306
DB_DATABASE=laravel_db DB_DATABASE=laravel_db
DB_USERNAME=laravel_user DB_USERNAME=laravel_user
DB_PASSWORD=super_strong_password DB_PASSWORD=super_strong_password
APP_KEY=""

View File

@@ -1,7 +1,8 @@
FROM bitnami/laravel FROM bitnami/laravel
COPY init_laravel.sh /scripts/init_laravel.sh COPY init_laravel.sh /init/init_laravel.sh
COPY .env /init/.env
RUN chmod +x /scripts/init_laravel.sh RUN chmod +x /init/init_laravel.sh
CMD composer i && php artisan serve --host=0.0.0.0 --port=8000 CMD bash /init/init_laravel.sh

View File

@@ -1,4 +1,11 @@
#!/bin/sh #!/bin/sh
composer install composer install
# Create .env if it does not exist
if ! [ -e ".env" ] ; then
cp /init/.env .
php artisan key:generate
fi
php artisan migrate --force php artisan migrate --force
php artisan db:seed php artisan serve --host=0.0.0.0 --port=8000

View File

@@ -127,6 +127,18 @@ return [
'path' => storage_path('logs/laravel.log'), 'path' => storage_path('logs/laravel.log'),
], ],
"projectError" => [
'driver' => 'single',
'path' => storage_path('logs/project.log'),
'level' => 'error',
],
"projectInfo" => [
'driver' => 'single',
'path' => storage_path('logs/project.log'),
'level' => 'info',
]
], ],
]; ];