upgrade makefile

Makefile

@@ -13,6 +13,11 @@ DOCKER_COMPOSE_DEV	:= docker-compose-dev.yml
 DOCKER_COMPOSE_MARC	:= docker-compose-marc.yml
 DOCKER_COMPOSE_MARC_DEV	:= docker-compose-marc-dev.yml
 
+### Django
+SECRET_KEY := whatever
+HOST       := localhost
+PORT       := 9080
+
 ###############
 ### TARGETS ###
 ###############
@@ -38,22 +43,19 @@ down: ## Run down all servers (production and dev)
 	docker-compose --file $(DOCKER_COMPOSE_MARC_DEV) down
 
 build: ### Build from the ground up
-	pipenv update
-	SECRET_KEY=doesntmatter ./manage.py collectstatic --noinput
 	docker-compose --file $(DOCKER_COMPOSE) build
 
-
-local: ## Run server in local without docker
-	pip install -r requirements.txt
-	./entrypoint.sh
-
-
 update:
 	pipenv update
 	pipenv lock -r > requirements.txt
+	SECRET_KEY=$(SECRET_KEY) ./manage.py collectstatic --noinput
+
+dev: ## Run dev server locally without docker
+	PRODUCTION=false HOST=$(HOST) PORT=$(PORT) SECRET_KEY=$(SECRET_KEY) ./entrypoint.sh
+
+prod: ## Run prod server locally without docker
+	PRODUCTION=true HOST=$(HOST) PORT=$(PORT) SECRET_KEY=$(SECRET_KEY) ./entrypoint.sh
 
-build: update
-	docker-compose -f $(DOCKER_COMPOSE) build
 
 # Special target help
 help: ## Show this help

docker-compose-marc.yml

@@ -16,7 +16,7 @@ services:
       caddy: valentin-colin.fr
       caddy.reverse_proxy: "{{upstreams 80}}"
       traefik.enable: "true"
-      traefik.http.routers.valentincolin_website.rule: Host(`valentin-colin.fr`)
+      traefik.http.routers.valentincolin_website.rule: Host(`valentin-colin.com`)
       traefik.http.routers.valentincolin_website.entrypoints: websecure
       traefik.http.routers.valentincolin_website.tls.certresolver: tls
       traefik.http.services.valentincolin_website.loadbalancer.server.port: 80

requirements.txt

@@ -1,4 +1,12 @@
-asgiref==3.5.2
-Django==4.1
+#
+# These requirements were autogenerated by pipenv
+# To regenerate from the project's Pipfile, run:
+#
+#    pipenv lock --requirements
+#
+
+-i https://pypi.org/simple
+asgiref==3.5.2; python_version >= '3.7'
+django==4.1
 dotmap==1.3.30
-sqlparse==0.4.2
+sqlparse==0.4.2; python_version >= '3.5'