@@ -18,8 +18,9 @@ IMAGE = $(CI_REGISTRY)/${CI_PROJECT_PATH}/${CI_PROJECT_NAME}
1818DIR = $(shell pwd)
1919VERSION ?= 1.5.0
2020
21- BASE_IMAGE = alpine
22- BASE_VERSION = 3.16
21+ export BASE_IMAGE =alpine
22+ export BASE_VERSION =3.16
23+ export ALPINE_VERSION =3.16
2324
2425GO_APP ?= bookstore
2526SOURCES = $(shell find . -name '* .go' | grep -v /vendor/)
@@ -79,41 +80,59 @@ git-clone:
7980 @echo " Task : Clone Repository Sources "
8081 @echo " Date/Time : ` date` "
8182 @echo " ================================================="
82- @./git-clone.sh $(SOURCE ) $(TARGET )
83+ @sh ./git-clone.sh $(SOURCE ) $(TARGET )
8384 @echo ' - DONE -'
8485
86+ # ========================== #
87+ # BUILD CONTAINER GO-APP #
88+ # ========================== #
89+ .PHONY : dockerhub-build-alpine ecr-build-alpine
90+ dockerhub-build-alpine :
91+ @echo " ========================================================"
92+ @echo " Task : Create Container GO-APP Alpine Image "
93+ @echo " Date/Time : ` date` "
94+ @echo " ========================================================"
95+ @sh ./dockerhub-build.sh alpine Dockerfile ${ALPINE_VERSION}
96+
97+ ecr-build-alpine :
98+ @echo " ========================================================"
99+ @echo " Task : Create Container GO-APP Alpine Image "
100+ @echo " Date/Time : ` date` "
101+ @echo " ========================================================"
102+ @sh ./ecr-build.sh $(ARGS ) alpine Dockerfile ${ALPINE_VERSION}
103+
85104# ========================= #
86- # BUILD CONTAINER CI/CD #
105+ # TAGS CONTAINER GO-APP #
87106# ========================= #
88- .PHONY : ecr-build -alpine
89- ecr-build -alpine
90- @echo " ================================================="
91- @echo " Task : Create Container CI/CD Alpine Image "
107+ .PHONY : tag-dockerhub-alpine tag-ecr -alpine
108+ dockerhub-tag -alpine
109+ @echo " ======================================================== "
110+ @echo " Task : Set Tags Image Alpine to DockerHub "
92111 @echo " Date/Time : ` date` "
93- @echo " ================================================="
94- @cd ${PATH_DOCKER} && ./ecr-build-alpine.sh $(ARGS ) $(CI_PATH )
95- @echo ' - DONE -'
112+ @echo " ========================================================"
113+ @sh ./dockerhub-tag.sh alpine ${ALPINE_VERSION}
96114
97- # ======================== #
98- # TAGS CONTAINER CI/CD #
99- # ======================== #
100- .PHONY : ecr-tag-alpine
101115ecr-tag-alpine :
102- @echo " ================================================="
116+ @echo " ======================================================== "
103117 @echo " Task : Set Tags Image Alpine to ECR"
104118 @echo " Date/Time : ` date` "
105- @echo " ================================================="
106- @cd ${PATH_DOCKER} && ./ecr-tag-alpine.sh $(ARGS ) $(CI_PATH )
107- @echo ' - DONE -'
119+ @echo " ========================================================"
120+ @sh ./ecr-tag.sh $(ARGS ) alpine ${ALPINE_VERSION} $(CI_PATH )
121+
122+ # ========================= #
123+ # PUSH CONTAINER GO-APP #
124+ # ========================= #
125+ .PHONY : dockerhub-push-alpine ecr-push-alpine
126+ dockerhub-push-alpine :
127+ @echo " ========================================================"
128+ @echo " Task : Push Image Alpine to DockerHub"
129+ @echo " Date/Time : ` date` "
130+ @echo " ========================================================"
131+ @sh ./dockerhub-push.sh alpine $(CI_PATH )
108132
109- # ======================== #
110- # PUSH CONTAINER CI/CD #
111- # ======================== #
112- .PHONY : ecr-push-alpine
113133ecr-push-alpine :
114- @echo " ================================================="
134+ @echo " ======================================================== "
115135 @echo " Task : Push Image Alpine to ECR"
116136 @echo " Date/Time : ` date` "
117- @echo " ================================================="
118- @cd ${PATH_DOCKER} && ./ecr-push-alpine.sh $(ARGS ) $(TAGS )
119- @echo ' - DONE -'
137+ @echo " ========================================================"
138+ @sh ./ecr-push.sh $(ARGS ) alpine $(CI_PATH )
0 commit comments