quality-of-life tweaks for developers (#57)

Makefile

@@ -1,10 +1,21 @@
 
-COMPOSER = composer
-#COMPOSER = docker compose run -it --rm aspiresync composer
+EXEC := meta/bin/dcexec
+# EXEC :=
+
+COMPOSER := $(EXEC) composer
 
 build:
 	$(COMPOSER) install
 
+init: init-docker build migrate
+
+init-docker:
+	docker compose down --remove-orphans --volumes
+	docker compose up -d
+
+migrate:
+	$(EXEC) bin/console doctrine:migrations:migrate --no-interaction
+
 test:
 	$(COMPOSER) run test
 

docker-compose.yml

@@ -34,6 +34,11 @@ services:
       aspire-net:
         aliases:
           - 'db.sync.aspiredev.org'
+    healthcheck:
+      test: [ "CMD", "pg_isready" ]
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
 networks:
   app-net: ~

meta/bin/dcexec

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+. $(dirname $0)/prelude.bash
+
+if which docker >/dev/null 2>&1; then
+  exec docker compose exec $APP_SERVICE "$@"
+else
+  # no docker means we're probably already in docker
+  exec "$@"
+fi

meta/bin/prelude.bash

@@ -1,6 +1,8 @@
 # This file should be sourced, not run
 [[ -n $TRACE ]] && [[ $TRACE != 0 ]] && set -x
 
+APP_SERVICE=${APP_SERVICE:-webapp}
+
 set -o errexit
 
 cd $(dirname $0)/../..