Commit cbd9ee3 1 parent dfa4a2e commit cbd9ee3 Copy full SHA for cbd9ee3
File tree 1 file changed +3
-14
lines changed
1 file changed +3
-14
lines changed Original file line number Diff line number Diff line change @@ -90,15 +90,15 @@ mac-cov: local-test ## Run the coverage report and display in a browser window (
90
90
# ################################################################################
91
91
cd : # # CD flow
92
92
ifeq ($(TAG_NAME ) , test)
93
- cd : update-env
93
+ cd :
94
94
oc -n " $( OPENSHIFT_REPOSITORY) -tools" tag $(DOCKER_NAME ) :dev $(DOCKER_NAME ) :$(TAG_NAME )
95
95
else ifeq ($(TAG_NAME), prod)
96
- cd : update-env
96
+ cd :
97
97
oc -n " $( OPENSHIFT_REPOSITORY) -tools" tag $(DOCKER_NAME ) :$(TAG_NAME ) $(DOCKER_NAME ) :$(TAG_NAME ) -$(shell date +% F)
98
98
oc -n " $( OPENSHIFT_REPOSITORY) -tools" tag $(DOCKER_NAME ) :test $(DOCKER_NAME ) :$(TAG_NAME )
99
99
else
100
100
TAG_NAME =dev
101
- cd : build update-env tag
101
+ cd : build tag
102
102
endif
103
103
104
104
build : # # Build the docker container
@@ -115,17 +115,6 @@ push: #build ## Push the docker container to the registry & tag latest
115
115
docker tag $(DOCKER_NAME ) $(REGISTRY_IMAGE ) :latest ;\
116
116
docker push $(REGISTRY_IMAGE ) :latest
117
117
118
- VAULTS =` cat devops/vaults.json `
119
- update-env : # # Update env from 1pass
120
- oc -n " $( OPS_REPOSITORY) -$( TAG_NAME) " exec " dc/vault-service-$( TAG_NAME) " -- ./scripts/1pass.sh \
121
- -m " secret" \
122
- -e " $( TAG_NAME) " \
123
- -a " $( DOCKER_NAME) -$( TAG_NAME) " \
124
- -n " $( OPENSHIFT_REPOSITORY) -$( TAG_NAME) " \
125
- -v " $( VAULTS) " \
126
- -r " false" \
127
- -f " false"
128
-
129
118
tag : push # # tag image
130
119
oc -n " $( OPENSHIFT_REPOSITORY) -tools" tag $(DOCKER_NAME ) :latest $(DOCKER_NAME ) :$(TAG_NAME )
131
120
You can’t perform that action at this time.
0 commit comments