From c8ba0a0fe306dbc3d36ba69b993c5dc960572b1c Mon Sep 17 00:00:00 2001 From: Tobias de Bruijn Date: Sat, 24 Feb 2024 19:56:05 +0100 Subject: [PATCH] Improve development workflow --- Makefile | 9 +++++++++ docker-compose.yml | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 7046a9c..3229f3f 100644 --- a/Makefile +++ b/Makefile @@ -5,11 +5,20 @@ all: help help: echo "Wilford OAuth2 Server" echo "Commands: " + echo "- up : Start all Docker containers required for a local installation" echo "- upload-all : Build and upload all Docker images" echo "- upload-server : Build and upload the server Docker image" echo "- upload-docs : Build and upload the docs Docker image" echo "- upload-ui : Build and upload the ui Docker image" +.PHONY: up +up: + docker compose up -d + echo "Wilford UI available at http://localhost:2522" + echo "Wilford Docs available at http://localhost:2523" + echo "EspoCRM UI availabel at http://localhost:2524" + echo "If this is the first run, please configure EspoCRM and Wilford." + .PHONY: upload-all upload-all: upload-server upload-docs upload-ui diff --git a/docker-compose.yml b/docker-compose.yml index 0fd0701..a96dbca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,8 @@ version: '3.2' services: mariadb-wilford: image: mariadb + volumes: + - "./tmp/mariadb-wilford:/var/lib/mysql" environment: - "MARIADB_ROOT_PASSWORD=123" - "MARIADB_USER=wilford" @@ -10,6 +12,8 @@ services: mariadb-espocrm: image: mariadb + volumes: + - "./tmp/mariadb-espocrm:/var/lib/mysql" environment: - "MARIADB_ROOT_PASSWORD=123" - "MARIADB_USER=espocrm"