From 074ca1d55bbf24481a9a662a798c4fa0f96bd446 Mon Sep 17 00:00:00 2001 From: sgfost Date: Fri, 16 Feb 2024 12:53:33 -0700 Subject: [PATCH] build: rename BUILD_ID to RELEASE_VERSION --- Makefile | 8 ++++---- deploy/conf/.env.template | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 88f7905f5..220eb83d4 100644 --- a/Makefile +++ b/Makefile @@ -65,9 +65,9 @@ $(PGPASS_PATH): $(DB_PASSWORD_PATH) $(PGPASS_TEMPLATE) | ${SECRETS_DIR} echo "${DB_HOST}:5432:*:${DB_USER}:$$(cat $(DB_PASSWORD_PATH))" > $(PGPASS_PATH) chmod 0600 $(PGPASS_PATH) -.PHONY: build-id -build-id: .env - $(ENVREPLACE) BUILD_ID $$(git describe --tags --abbrev=1) .env +.PHONY: release-version +release-version: .env + $(ENVREPLACE) RELEASE_VERSION $$(git describe --tags --abbrev=1) .env .env: $(DB_PASSWORD_PATH) $(SECRET_KEY_PATH) if [ ! -f .env ]; then \ @@ -78,7 +78,7 @@ build-id: .env $(ENVREPLACE) TEST_BASIC_AUTH_PASSWORD $$(openssl rand -base64 42) .env .PHONY: docker-compose.yml -docker-compose.yml: base.yml dev.yml staging.yml prod.yml config.mk $(PGPASS_PATH) build-id +docker-compose.yml: base.yml dev.yml staging.yml prod.yml config.mk $(PGPASS_PATH) release-version case "$(DEPLOY_ENVIRONMENT)" in \ dev|staging|e2e) docker compose -f base.yml -f $(DEPLOY_ENVIRONMENT).yml config > docker-compose.yml;; \ prod) docker compose -f base.yml -f staging.yml -f $(DEPLOY_ENVIRONMENT).yml config > docker-compose.yml;; \ diff --git a/deploy/conf/.env.template b/deploy/conf/.env.template index 1d114d30a..68d6cbc2e 100644 --- a/deploy/conf/.env.template +++ b/deploy/conf/.env.template @@ -1,5 +1,5 @@ # app -BUILD_ID= +RELEASE_VERSION= EXPIRED_JOB_DAYS_THRESHOLD=180 EXPIRED_EVENT_DAYS_THRESHOLD=2