Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

23222 comment out 1pass udpate section by 20241001 #2996

Merged
merged 4 commits into from
Sep 25, 2024
Merged

23222 comment out 1pass udpate section by 20241001 #2996

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d88878
23222 comment out 1pass udpate section by 20241001
kzdev420 Sep 20, 2024
ab5f27b
remove update-env
kzdev420 Sep 24, 2024
a9f5c9d
add the vaults
kzdev420 Sep 24, 2024
3d46d8f
fix misc
kzdev420 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 17 additions & 13 deletions legal-api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,18 @@ mac-cov: test ## Run the coverage report and display in a browser window (mac)
#################################################################################
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: build tag
endif

build: ## Build the docker container
Expand All @@ -115,16 +118,17 @@ push: #build ## Push the docker container to the registry & tag latest
docker tag $(DOCKER_NAME) $(REGISTRY_IMAGE):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"
# 1Password CLI1 will be deprecated on Oct 1, 2024
vysakh-menon-aot marked this conversation as resolved.
Show resolved Hide resolved
# 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"

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