Skip to content

Commit

Permalink
fix: set HTTP_PROTO after include
Browse files Browse the repository at this point in the history
LeKovr committed Jun 17, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 4122e12 commit 00de9ce
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions apps/drone/dcape-app/Makefile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 00de9ce

Please sign in to comment.