diff --git a/.idea/php.xml b/.idea/php.xml index 4c03855..0eee0f9 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -12,99 +12,109 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/symfony-skeleton.iml b/.idea/symfony-skeleton.iml index 8707b5c..f01cd69 100644 --- a/.idea/symfony-skeleton.iml +++ b/.idea/symfony-skeleton.iml @@ -5,99 +5,110 @@ - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/symfony2.xml b/.idea/symfony2.xml new file mode 100644 index 0000000..bd98e40 --- /dev/null +++ b/.idea/symfony2.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Makefile b/Makefile index 90928ff..fb677aa 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ include .env DOCKER_BUILD_COMMAND=docker build --file Dockerfile --no-cache --platform linux/amd64 --tag $(APP_DOCKER_TAG) +run: + $(PWD)/bin/rr -c .rr.dev.yaml serve + up: $(DOCKER_BUILD_COMMAND) --build-arg APP_ENV=dev . docker compose --env-file .env up -d diff --git a/shell.nix b/shell.nix index 4558034..b8feed1 100644 --- a/shell.nix +++ b/shell.nix @@ -34,14 +34,18 @@ pkgs.mkShell { inherit packages; shellHook = '' - # https://yannesposito.com/posts/0024-replace-docker-compose-with-nix-shell/index.html - if [ ! -d var/log ]; then - mkdir -p var/log + export COMPOSER_CACHE_DIR=$(pwd)/var/cache/composer + mkdir -p $(pwd)/var/cache/composer + + if [ ! -d $(pwd)/var/log ]; then + mkdir -p $(pwd)/var/log fi + + # https://yannesposito.com/posts/0024-replace-docker-compose-with-nix-shell/index.html if [ ! -d ${postgresDirectory} ]; then mkdir -p ${postgresDirectory} initdb -D ${postgresDirectory} - pg_ctl -D ${postgresDirectory} -l var/log/postgres.log -o "--unix_socket_directories='$PWD'" start + pg_ctl -D ${postgresDirectory} -l $(pwd)/var/log/postgres.log -o "--unix_socket_directories='$PWD'" start createdb app pg_ctl -D ${postgresDirectory} stop fi