From 90581e497a18753fa3756235e56a4ff70276dbeb Mon Sep 17 00:00:00 2001 From: Chiman Jain <36687396+chimanjain@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:32:01 +0530 Subject: [PATCH] Replace docker build with podman build (#157) * replace docker build with podman build * update codeowners --- .github/CODEOWNERS | 13 +++++++------ Makefile | 17 +++++++++-------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5699e8c..a704222 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -7,22 +7,23 @@ # be requested for review when someone opens a pull request. # order is alphabetical for easier maintenance. # -# Sean Gallacher (gallacher) -# Trevor Dawe (tdawe) +# AnandatDell (anandrajak1) # Alexander Hoppe (hoppea2) # Alik Saring (alikdell) # Aaron Tye (atye) +# Chiman Jain (chimanjain) +# Don Khan (donatwork) # Florian Coulombel (coulof) +# Nitesh Rewatkar (nitesh3108) +# Sean Gallacher (gallacher) # Shayna Finocchiaro (shaynafinocchiaro) # Sharmila Ramamoorthy (sharmilarama) # Forrest Xia (forrestxia) +# Trevor Dawe (tdawe) # Yian Zong (YianZong) # Yiming Bao (baoy1) # Tao He (taohe1012) # Peter Cao (P-Cao) -# Don Khan (donatwork) -# Harsha Yalamanchili (harshaatdell) -# AnandatDell (anandrajak1) # for all files: -* @gallacher @tdawe @alikdell @atye @hoppea2 @coulof @shaynafinocchiaro @sharmilarama @forrestxia @YianZong @baoy1 @taohe1012 @P-Cao @donatwork @harshaatdell @anandrajak1 +* @gallacher @tdawe @alikdell @atye @hoppea2 @coulof @shaynafinocchiaro @sharmilarama @forrestxia @YianZong @baoy1 @taohe1012 @P-Cao @donatwork @anandrajak1 @chimanjain @nitesh3108 diff --git a/Makefile b/Makefile index fcf5f4f..124b9c2 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,9 @@ help: @echo @echo "build - Builds the code locally" @echo "clean - Cleans the local build" - @echo "docker - Builds Docker image" - @echo "tag - Tags Docker image" - @echo "push - Pushes Docker image to a registry" + @echo "podman - Builds Podman image" + @echo "tag - Tags Podman image" + @echo "push - Pushes Podman image to a registry" @echo "check - Runs code checking tools: lint, format, gosec, and vet" @echo "test - Runs the unit tests" @echo @@ -38,17 +38,18 @@ build-base-image: download-csm-common @echo "Base image build: SUCCESS" $(eval BASEIMAGE=topology-ubimicro:latest) -.PHONY: docker -docker: build-base-image - docker build -t csm-topology -f Dockerfile --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) . +# Pre-requisites: RHEL, buildah, podman +.PHONY: podman +podman: build-base-image + podman build -t csm-topology -f Dockerfile --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE) . .PHONY: tag tag: - docker tag csm-topology:latest ${DOCKER_REPO}/csm-topology:latest + podman tag csm-topology:latest ${DOCKER_REPO}/csm-topology:latest .PHONY: push push: - docker push ${DOCKER_REPO}/csm-topology:latest + podman push ${DOCKER_REPO}/csm-topology:latest .PHONY: check check: