From 00de9ce278e67c4b2c8603f76588f0f4efd0e33d Mon Sep 17 00:00:00 2001 From: Alexey Kovrizhkin Date: Sat, 17 Jun 2023 23:13:21 +0300 Subject: [PATCH] fix: set HTTP_PROTO after include --- apps/drone/dcape-app/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/drone/dcape-app/Makefile b/apps/drone/dcape-app/Makefile index faae271..da159c5 100644 --- a/apps/drone/dcape-app/Makefile +++ b/apps/drone/dcape-app/Makefile @@ -34,12 +34,6 @@ PGDATABASE_EXRA ?= # User who runs DB_INIT_SQL and creates PGDATABASE_EXRA PG_ADMIN ?= postgres -ifeq ($(USE_TLS),false) -HTTP_PROTO ?= http -else -HTTP_PROTO ?= https -endif - # ------------------------------------------------------------------------------ # .env template define CONFIG_DEF @@ -90,6 +84,13 @@ export -include $(CFG) export +# calculate values after includes +ifeq ($(USE_TLS),false) +HTTP_PROTO ?= http +else +HTTP_PROTO ?= https +endif + .PHONY: all up down dc .docker-wait db-create db-drop psql init config .drone-default help all: help