Add CI to build&push containers

Signed-off-by: Ondra Machacek <[email protected]>
kubev2v · Oct 2, 2024 · a3692fb · a3692fb
1 parent 30eaef1
commit a3692fb
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 11 deletions.
diff --git a/.tekton/agent-pull-request.yaml b/.tekton/agent-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: Dockerfile.agent
+    value: Containerfile.agent
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.

diff --git a/.tekton/agent-push.yaml b/.tekton/agent-push.yaml
@@ -24,7 +24,7 @@ spec:
   - name: output-image
     value: quay.io/redhat-user-workloads/omachace-tenant/migration-planner/agent:{{revision}}
   - name: dockerfile
-    value: Dockerfile.agent
+    value: Containerfile.agent
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.

diff --git a/.tekton/collector-pull-request.yaml b/.tekton/collector-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: Dockerfile.collector
+    value: Containerfile.collector
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.

diff --git a/.tekton/collector-push.yaml b/.tekton/collector-push.yaml
@@ -24,7 +24,7 @@ spec:
   - name: output-image
     value: quay.io/redhat-user-workloads/omachace-tenant/migration-planner/collector:{{revision}}
   - name: dockerfile
-    value: Dockerfile.collector
+    value: Containerfile.collector
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.

diff --git a/.tekton/migration-planner-api-pull-request.yaml b/.tekton/migration-planner-api-pull-request.yaml
@@ -27,7 +27,7 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: Dockerfile.planner-api
+    value: Containerfile.api
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.

diff --git a/.tekton/migration-planner-api-push.yaml b/.tekton/migration-planner-api-push.yaml
@@ -24,7 +24,7 @@ spec:
   - name: output-image
     value: quay.io/redhat-user-workloads/omachace-tenant/migration-planner/migration-planner-api:{{revision}}
   - name: dockerfile
-    value: Dockerfile.planner-api
+    value: Containerfile.api
   pipelineSpec:
     description: |
       This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.

diff --git a/Dockerfile.agent → Containerfile.agent b/Dockerfile.agent → Containerfile.agent
diff --git a/Dockerfile.planner-api → Containerfile.api b/Dockerfile.planner-api → Containerfile.api
diff --git a/Dockerfile.collector → Containerfile.collector b/Dockerfile.collector → Containerfile.collector
diff --git a/Makefile b/Makefile
@@ -5,8 +5,10 @@ ROOT_DIR := $(or ${ROOT_DIR},$(shell dirname $(realpath $(firstword $(MAKEFILE_L
 GO_FILES := $(shell find ./ -name ".go" -not -path "./bin" -not -path "./packaging/*")
 GO_CACHE := -v $${HOME}/go/migration-planner-go-cache:/opt/app-root/src/go:Z -v $${HOME}/go/migration-planner-go-cache/.cache:/opt/app-root/src/.cache:Z
 TIMEOUT ?= 30m
-
 VERBOSE ?= false
+MIGRATION_PLANNER_AGENT_IMAGE ?= quay.io/kubev2v/migration-planner-agent
+MIGRATION_PLANNER_COLLECTOR_IMAGE ?= quay.io/kubev2v/migration-planner-collector
+MIGRATION_PLANNER_API_IMAGE ?= quay.io/kubev2v/migration-planner-api
 
 SOURCE_GIT_TAG ?=$(shell git describe --always --long --tags --abbrev=7 --match 'v[0-9]*' || echo 'v0.0.0-unknown-$(SOURCE_GIT_COMMIT)')
 SOURCE_GIT_TREE_STATE ?=$(shell ( ( [ ! -d ".git/" ] || git diff --quiet ) && echo 'clean' ) || echo 'dirty')
@@ -60,22 +62,37 @@ build-api: bin
 
 
 # rebuild container only on source changes
+bin/.migration-planner-agent-container: bin Containerfile.agent go.mod go.sum $(GO_FILES)
+	mkdir -p $${HOME}/go/migration-planner-go-cache/.cache
+	podman build -f Containerfile.agent $(GO_CACHE) -t $(MIGRATION_PLANNER_AGENT_IMAGE):latest
+	touch bin/.migration-planner-agent-container
+
+bin/.migration-planner-collector-container: bin Containerfile.collector go.mod go.sum $(GO_FILES)
+	mkdir -p $${HOME}/go/migration-planner-go-cache/.cache
+	podman build -f Containerfile.collector $(GO_CACHE) -t $(MIGRATION_PLANNER_COLLECTOR_IMAGE):latest
+	touch bin/.migration-planner-collector-container
+
 bin/.migration-planner-api-container: bin Containerfile.api go.mod go.sum $(GO_FILES)
 	mkdir -p $${HOME}/go/migration-planner-go-cache/.cache
-	podman build -f Containerfile.api $(GO_CACHE) -t migration-planner-api:latest
+	podman build -f Containerfile.api $(GO_CACHE) -t $(MIGRATION_PLANNER_API_IMAGE):latest
 	touch bin/.migration-planner-api-container
 
 migration-planner-api-container: bin/.migration-planner-api-container
+migration-planner-collector-container: bin/.migration-planner-collector-container
+migration-planner-agent-container: bin/.migration-planner-agent-container
 
-
-build-containers: migration-planner-api-container
+build-containers: migration-planner-api-container migration-planner-agent-container migration-planner-collector-container
 
 .PHONY: build-containers
 
+push-containers: build-containers
+	podman push $(MIGRATION_PLANNER_API_IMAGE):latest
+	podman push $(MIGRATION_PLANNER_COLLECTOR_IMAGE):latest
+	podman push $(MIGRATION_PLANNER_AGENT_IMAGE):latest
+
 bin:
 	mkdir -p bin
 
-
 clean:
 	- rm -f -r bin