Skip to content

Commit 0d7d7bb

Browse files
Merge pull request #3707 from Azure/msoriano-fix-frontend-make-run-args
fix: ensure needed variables for frontend make run target are set
2 parents 55fd2de + 77079ac commit 0d7d7bb

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

frontend/Env.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
LOCATION ?= {{ .region }}
22
ARO_HCP_IMAGE_ACR ?= {{ .acr.svc.name }}
3-
FRONTEND_IMAGE_REPOSITORY ?= {{ .frontend.image.repository }}
3+
FRONTEND_IMAGE_REPOSITORY ?= {{ .frontend.image.repository }}
4+
DB_NAME ?= {{ .frontend.cosmosDB.name }}
5+
DB_URL ?= $(shell az cosmosdb show -n {{ .frontend.cosmosDB.name }} -g {{ .regionRG }} --query documentEndpoint -o tsv)

frontend/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ $(BINARY): $(FRONTEND_SOURCES)
3131
go build $(LDFLAGS) -o $(BINARY) .
3232

3333
run: $(BINARY)
34-
DB_URL=$$(az cosmosdb show -n ${DB_NAME} -g ${REGION_RG} --query documentEndpoint -o tsv) && \
35-
./$(BINARY)--location ${LOCATION} \
34+
./$(BINARY) --location ${LOCATION} \
3635
--clusters-service-url http://localhost:8000 \
3736
--cosmos-name ${DB_NAME} \
38-
--cosmos-url $${DB_URL}
37+
--cosmos-url ${DB_URL}
3938
.PHONY: run
4039

4140
clean:

0 commit comments

Comments
 (0)