fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-08 06:18:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add default environment override back to common.mk (#1586)

Browse Source 
* As part of https://github.com/chanzuckerberg/cellxgene/pull/1548 we
  accidentally removed the part of the "get_or_else_dev_env_default"
  function that allowed users to override the environment variables.
  This commit adds that back.
* When environment.default was changed from a shell script file to json,
  the shell commands used to parameterize DATASET were not evaluated.
  This commit fixes this issue as well.
This commit is contained in:
Matt Weiden
2020-06-25 08:25:29 -07:00
committed by GitHub
parent 83376627e8
commit 0fd3d4b8f4
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.mk
+12 -7
View File
@@ -7,8 +7,13 @@ ifeq ($(shell which jq),)
$(error Please install jq using "apt-get install jq" or "brew install jq") $(error Please install jq using "apt-get install jq" or "brew install jq")
endif endif
define GetValueFromJson define env_or_else_default
$(shell jq -r '.$(1)' "$(PROJECT_ROOT)/environment.default.json") $(if $($(1)),$($(1)),$(shell jq -r '.$(1)' "$(PROJECT_ROOT)/environment.default.json"))
endef
# if not a full path, create a full path relative to the project root
define full_path
$(shell [[ $(1) = /* ]] && echo $(1) || echo $(PROJECT_ROOT)/$(1))
endef endef
# https://stackoverflow.com/a/14777895/9587410 # https://stackoverflow.com/a/14777895/9587410
@@ -17,11 +22,11 @@ ifeq ($(shell uname),Darwin) # is Windows_NT on XP, 2000, 7, Vista, 10...
endif endif
export CELLXGENE_COMMIT := $(shell git rev-parse --short HEAD) export CELLXGENE_COMMIT := $(shell git rev-parse --short HEAD)
export CXG_SERVER_PORT := $(call GetValueFromJson,CXG_SERVER_PORT) export CXG_SERVER_PORT := $(call env_or_else_default,CXG_SERVER_PORT)
export CXG_CLIENT_PORT := $(call GetValueFromJson,CXG_CLIENT_PORT) export CXG_CLIENT_PORT := $(call env_or_else_default,CXG_CLIENT_PORT)
export JEST_ENV := $(call GetValueFromJson,JEST_ENV) export CXG_OPTIONS := $(call env_or_else_default,CXG_OPTIONS)
export DATASET := $(call GetValueFromJson,DATASET) export DATASET := $(call full_path,$(call env_or_else_default,DATASET))
export CXG_OPTIONS := $(call GetValueFromJson,CXG_OPTIONS) export JEST_ENV := $(call env_or_else_default,JEST_ENV)
.PHONY: start-server .PHONY: start-server
start-server: start-server:
environment.default.json
+1 -1
View File
@@ -2,7 +2,7 @@
"CXG_CLIENT_PORT": 3000, "CXG_CLIENT_PORT": 3000,
"CXG_OPTIONS": "--debug", "CXG_OPTIONS": "--debug",
"CXG_SERVER_PORT": 5005, "CXG_SERVER_PORT": 5005,
"DATASET": "$(git rev-parse --show-toplevel)/example-dataset/pbmc3k.h5ad", "DATASET": "example-dataset/pbmc3k.h5ad",
"DEBUG": "debug", "DEBUG": "debug",
"DEV": "dev", "DEV": "dev",
"JEST_ENV": "prod", "JEST_ENV": "prod",