Skip to content

Commit 00de9ce

Browse files
committed
fix: set HTTP_PROTO after include
1 parent 4122e12 commit 00de9ce

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

apps/drone/dcape-app/Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ PGDATABASE_EXRA ?=
3434
# User who runs DB_INIT_SQL and creates PGDATABASE_EXRA
3535
PG_ADMIN ?= postgres
3636

37-
ifeq ($(USE_TLS),false)
38-
HTTP_PROTO ?= http
39-
else
40-
HTTP_PROTO ?= https
41-
endif
42-
4337
# ------------------------------------------------------------------------------
4438
# .env template
4539
define CONFIG_DEF
@@ -90,6 +84,13 @@ export
9084
-include $(CFG)
9185
export
9286

87+
# calculate values after includes
88+
ifeq ($(USE_TLS),false)
89+
HTTP_PROTO ?= http
90+
else
91+
HTTP_PROTO ?= https
92+
endif
93+
9394
.PHONY: all up down dc .docker-wait db-create db-drop psql init config .drone-default help
9495

9596
all: help

0 commit comments

Comments
 (0)