From 23dde5ee210cece907e7236a53ff787e2b6e8359 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@framasoft.org>
Date: Dec 23 2020 12:27:16 +0000
Subject: 🔀 Merge branch 'build-make-improvements' into 'development'


[236] feat(build): parametrize make variables

See merge request fiat-tux/hat-softwares/lufi!75
---

diff --git a/Makefile b/Makefile
index 5071551..2feaa73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,17 @@
-EXTRACTDIR=-D lib -D themes/default/templates
-POT=themes/default/lib/Lufi/I18N/lufi.pot
-ENPO=themes/default/lib/Lufi/I18N/en.po
-XGETTEXT=carton exec local/bin/xgettext.pl -u
-CARTON=carton exec
-REAL_LUFI=script/application
-LUFI=script/lufi
+EXTRACTDIR ?= -D lib -D themes/default/templates
+POT ?= themes/default/lib/Lufi/I18N/lufi.pot
+ENPO ?= themes/default/lib/Lufi/I18N/en.po
+XGETTEXT ?= carton exec local/bin/xgettext.pl -u
+CARTON ?= carton exec
+REAL_LUFI ?= script/application
+LUFI ?= script/lufi
+LDAP_CONTAINER_IMAGE ?= rroemhild/test-openldap:latest
+LOCAL_LDAP_PORT ?= 389
+LOCAL_SWIFT_PORT ?= 8080
+SWIFT_CONTAINER_IMAGE ?= swiftstack/picoswiftstack:latest
+MORBO_HOST ?= 0.0.0.0
+MORBO_PORT ?= 3030
+
 
 locales:
 	$(XGETTEXT) $(EXTRACTDIR) -o $(POT) 2>/dev/null
@@ -23,15 +30,15 @@ clean:
 	rm -rf lufi.db files/
 
 dev: clean
-	$(CARTON) morbo $(LUFI) --listen http://0.0.0.0:3000 --watch lib/ --watch script/ --watch themes/ --watch lufi.conf
+	$(CARTON) morbo $(LUFI) --listen http://$(MORBO_HOST):$(MORBO_PORT) --watch lib/ --watch script/ --watch themes/ --watch lufi.conf
 
 ldap:
-	sudo docker run --privileged -d -p 389:389 rroemhild/test-openldap; exit 0
+	sudo docker run --privileged -d -p $(LOCAL_LDAP_PORT):389 $(LDAP_CONTAINER_IMAGE); exit 0
 
 ldapdev: ldap dev
 
 swift:
-	sudo docker run -d --rm -p 8080:8080 --hostname="picoswiftstack" --name="picoswiftstack" swiftstack/picoswiftstack; exit 0
+	sudo docker run -d --rm -p $(LOCAL_SWIFT_PORT):8080 --hostname="picoswiftstack" --name="picoswiftstack" $(SWIFT_CONTAINER_IMAGE); exit 0
 	@echo "Sleeping 20 seconds to let picoswiftstack start"
 	@sleep 20
 	sudo docker exec picoswiftstack get_auth