Skip to content

Commit

Permalink
Update Makefile - commented out update-env as per P.W.
Browse files Browse the repository at this point in the history
  • Loading branch information
rarmitag authored Jan 10, 2025
1 parent 8db59af commit 56089f2
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions api/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,18 @@ mac-cov: local-test ## Run the coverage report and display in a browser window (
#################################################################################
cd: ## CD flow
ifeq ($(TAG_NAME), test)
cd: update-env
## cd: update-env
cd:
oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):dev $(DOCKER_NAME):$(TAG_NAME)
else ifeq ($(TAG_NAME), prod)
cd: update-env
## cd: update-env
cd:
oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):$(TAG_NAME) $(DOCKER_NAME):$(TAG_NAME)-$(shell date +%F)
oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):test $(DOCKER_NAME):$(TAG_NAME)
else
TAG_NAME=dev
cd: build update-env tag
## cd: build update-env tag
cd:
endif

build: ## Build the docker container
Expand All @@ -113,15 +116,15 @@ push: #build ## Push the docker container to the registry & tag latest
docker push $(REGISTRY_IMAGE):latest

VAULTS=`cat devops/vaults.json`
update-env: ## Update env from 1pass
oc -n "$(OPS_REPOSITORY)-$(TAG_NAME)" exec "dc/vault-service-$(TAG_NAME)" -- ./scripts/1pass.sh \
-m "secret" \
-e "$(TAG_NAME)" \
-a "$(DOCKER_NAME)-$(TAG_NAME)" \
-n "$(OPENSHIFT_REPOSITORY)-$(TAG_NAME)" \
-v "$(VAULTS)" \
-r "true" \
-f "false"
## update-env: ## Update env from 1pass
# oc -n "$(OPS_REPOSITORY)-$(TAG_NAME)" exec "dc/vault-service-$(TAG_NAME)" -- ./scripts/1pass.sh \
# -m "secret" \
# -e "$(TAG_NAME)" \
# -a "$(DOCKER_NAME)-$(TAG_NAME)" \
# -n "$(OPENSHIFT_REPOSITORY)-$(TAG_NAME)" \
# -v "$(VAULTS)" \
# -r "true" \
# -f "false"

tag: push ## tag image
oc -n "$(OPENSHIFT_REPOSITORY)-tools" tag $(DOCKER_NAME):latest $(DOCKER_NAME):$(TAG_NAME)
Expand Down

0 comments on commit 56089f2

Please sign in to comment.