@@ -3,6 +3,7 @@ CAT_CMD=$(if $(filter $(OS),Windows_NT),type,cat)
3
3
RELEASE_VER: =
4
4
CURRENT_DIR =$(shell pwd)
5
5
GIT_BRANCH: =$(shell git symbolic-ref --short HEAD 2>&1 | grep -v fatal)
6
+
6
7
# define the GO_BUILD_ARGS if you need to pass additional arguments to the go build
7
8
GO_BUILD_ARGS? =
8
9
@@ -22,16 +23,7 @@ CLIENT_GEN ?= $(LOCALBIN)/client-gen
22
23
LISTER_GEN ?= $(LOCALBIN ) /lister-gen
23
24
INFORMER_GEN ?= $(LOCALBIN ) /informer-gen
24
25
25
- # Reset branch name if this a Travis CI environment
26
- ifneq ($(strip $(TRAVIS_BRANCH ) ) ,)
27
- GIT_BRANCH:=${TRAVIS_BRANCH}
28
- endif
29
-
30
26
TAG: =$(shell echo "")
31
- # Check for git repository id sent by Travis-CI
32
- ifneq ($(strip $(git_repository_id ) ) ,)
33
- TAG:=${TAG}${git_repository_id}-
34
- endif
35
27
36
28
# Check for current branch name and update 'RELEASE_VER' and 'TAG'
37
29
ifneq ($(strip $(GIT_BRANCH ) ) ,)
@@ -184,7 +176,6 @@ push-images: verify-tag-name
184
176
ifeq ($(strip $(quay_repository ) ) ,)
185
177
$(info No registry information provided. To push images to a docker registry please set)
186
178
$(info environment variables: quay_repository, quay_token, and quay_id. Environment)
187
- $(info variables do not need to be set for github Travis CICD.)
188
179
else
189
180
$(info Log into quay)
190
181
docker login quay.io -u ${quay_id} --password ${quay_token}
193
184
$(info Push the docker image to registry)
194
185
docker push ${quay_repository}/mcad-controller:${TAG}
195
186
ifeq ($(strip $(git_repository_id ) ) ,main)
196
- $(info Update the `latest ` tag when built from `main`)
187
+ $(info Update the `dev ` tag when built from `main`)
197
188
docker tag mcad-controller:${TAG} ${quay_repository}/mcad-controller:latest
198
189
docker push ${quay_repository}/mcad-controller:latest
199
190
endif
0 commit comments