Merge pull request #572 from replicatedhq/divolgin/builds

github actions for kotsadm
replicatedhq · May 21, 2020 · 234fbf6 · 234fbf6
2 parents 56f5dbf + b984152
commit 234fbf6
Show file tree

Hide file tree

Showing 8 changed files with 577 additions and 12 deletions.
diff --git a/.github/workflows/kotsadm.yaml b/.github/workflows/kotsadm.yaml
diff --git a/kotsadm/Makefile b/kotsadm/Makefile
@@ -33,13 +33,13 @@ build-ttl-ci.sh:
 
 .PHONY: build-alpha
 build-alpha:
-	docker build -f deploy/Dockerfile --build-arg version=${BUILDKITE_COMMIT} -t kotsadm/kotsadm:alpha .
+	docker build -f deploy/Dockerfile --build-arg version=${GIT_COMMIT} -t kotsadm/kotsadm:alpha .
 	docker push kotsadm/kotsadm:alpha
 
 .PHONY: build-release
 build-release:
-	docker build -f deploy/Dockerfile --build-arg version=${BUILDKITE_TAG} -t kotsadm/kotsadm:${BUILDKITE_TAG} .
-	docker push kotsadm/kotsadm:${BUILDKITE_TAG}
+	docker build -f deploy/Dockerfile --build-arg version=${GIT_TAG} -t kotsadm/kotsadm:${GIT_TAG} .
+	docker push kotsadm/kotsadm:${GIT_TAG}
 
 .PHONY: project-pact-tests
 project-pact-tests:

diff --git a/kotsadm/api/Makefile b/kotsadm/api/Makefile
@@ -81,12 +81,12 @@ build-alpha: IMAGE = kotsadm/${PROJECT_NAME}:alpha
 build-alpha: build_and_push
 
 .PHONY: build-release
-build-release: IMAGE = kotsadm/${PROJECT_NAME}:${BUILDKITE_TAG}
+build-release: IMAGE = kotsadm/${PROJECT_NAME}:${GIT_TAG}
 build-release: build_and_push
 
 .PHONY: build_and_push
 build_and_push:
-	docker build -f deploy/Dockerfile -t ${IMAGE} --build-arg commit="$${BUILDKITE_COMMIT:0:7}" --no-cache .
+	docker build -f deploy/Dockerfile -t ${IMAGE} --build-arg commit="$${GIT_COMMIT:0:7}" --no-cache .
 	docker push ${IMAGE}
 
 .PHONY: no-yarn

diff --git a/kotsadm/kurl_proxy/Makefile b/kotsadm/kurl_proxy/Makefile
@@ -25,5 +25,5 @@ build-alpha:
 
 .PHONY: build-release
 build-release:
-	docker build -f deploy/Dockerfile -t kotsadm/kurl-proxy:${BUILDKITE_TAG} .
-	docker push kotsadm/kurl-proxy:${BUILDKITE_TAG}
+	docker build -f deploy/Dockerfile -t kotsadm/kurl-proxy:${GIT_TAG} .
+	docker push kotsadm/kurl-proxy:${GIT_TAG}
diff --git a/kotsadm/migrations/Makefile b/kotsadm/migrations/Makefile
@@ -6,7 +6,7 @@ schema-alpha: IMAGE = kotsadm/${PROJECT_NAME}:alpha
 schema-alpha: build_schema
 
 .PHONY: schema-release
-schema-release: IMAGE = kotsadm/${PROJECT_NAME}:${BUILDKITE_TAG}
+schema-release: IMAGE = kotsadm/${PROJECT_NAME}:${GIT_TAG}
 schema-release: build_schema
 
 .PHONY: build-ttl-ci.sh

diff --git a/kotsadm/minio/Makefile b/kotsadm/minio/Makefile
@@ -17,5 +17,5 @@ publish-latest: IMAGE_TAG = alpha
 publish-latest: publish
 
 .PHONY: publish-release
-publish-release: IMAGE_TAG = ${BUILDKITE_TAG}
+publish-release: IMAGE_TAG = ${GIT_TAG}
 publish-release: publish
diff --git a/kotsadm/operator/Makefile b/kotsadm/operator/Makefile
@@ -49,5 +49,5 @@ build-alpha:
 
 .PHONY: build-release
 build-release:
-	docker build -f deploy/Dockerfile -t kotsadm/kotsadm-operator:${BUILDKITE_TAG} .
-	docker push kotsadm/kotsadm-operator:${BUILDKITE_TAG}
+	docker build -f deploy/Dockerfile -t kotsadm/kotsadm-operator:${GIT_TAG} .
+	docker push kotsadm/kotsadm-operator:${GIT_TAG}
diff --git a/kotsadm/web/Makefile b/kotsadm/web/Makefile
@@ -49,7 +49,7 @@ build-local:
 		--compress
 
 .PHONY: build-kotsadm
-build-kotsadm: SHIP_CLUSTER_BUILD_VERSION = $(if ${BUILDKITE_TAG},${BUILDKITE_TAG},$(shell echo ${BUILDKITE_COMMIT} | cut -c1-7))
+build-kotsadm: SHIP_CLUSTER_BUILD_VERSION = $(if ${GIT_TAG},${GIT_TAG},$(shell echo ${GIT_COMMIT} | cut -c1-7))
 build-kotsadm:
 	SHIP_CLUSTER_BUILD_VERSION=$(SHIP_CLUSTER_BUILD_VERSION) \
 	node \