Skip to content

Commit

Permalink
build: rename BUILD_ID to RELEASE_VERSION
Browse files Browse the repository at this point in the history
  • Loading branch information
sgfost committed Feb 16, 2024
1 parent 7801b11 commit 074ca1d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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;; \
Expand Down
2 changes: 1 addition & 1 deletion deploy/conf/.env.template
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# app
BUILD_ID=
RELEASE_VERSION=
EXPIRED_JOB_DAYS_THRESHOLD=180
EXPIRED_EVENT_DAYS_THRESHOLD=2

Expand Down

0 comments on commit 074ca1d

Please sign in to comment.