From 3570f0b38e2b20d83546b93c98623dcf74903e75 Mon Sep 17 00:00:00 2001 From: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> Date: Thu, 16 May 2024 00:06:16 +0530 Subject: [PATCH 1/7] Update Makefile remove root_image and cert_image and all the references Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> --- docker/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 237bb8c5306..86acfd250db 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,6 +1,3 @@ -VERSION := 1.0.0 -ROOT_IMAGE ?= alpine:3.16 -CERT_IMAGE := $(ROOT_IMAGE) GOLANG_IMAGE := golang:1.22-alpine DOCKER_REGISTRY ?= localhost:5000 From 44b068c0ae41808bb2e82ecc22456ec71b3e8b9d Mon Sep 17 00:00:00 2001 From: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> Date: Thu, 16 May 2024 00:06:37 +0530 Subject: [PATCH 2/7] Update Makefile add Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> --- docker/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 86acfd250db..0e0bbc82685 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -9,8 +9,6 @@ create-baseimg-debugimg: create-baseimg create-debugimg create-baseimg: prepare-docker-buildx docker buildx build -t $(BASE_IMAGE) --push \ - --build-arg root_image=$(ROOT_IMAGE) \ - --build-arg cert_image=$(CERT_IMAGE) \ --platform=$(PLATFORMS) \ docker/base From 3721805472407d7e715bea70fe0be994d0242d6b Mon Sep 17 00:00:00 2001 From: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> Date: Thu, 16 May 2024 00:07:59 +0530 Subject: [PATCH 3/7] Update Dockerfile fix alpine version to 3.19.0 Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> --- docker/base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 6fa10c92bd1..0676028bbb2 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,5 +1,5 @@ -ARG cert_image -ARG root_image +ARG cert_image=alpine:3.19.0 +ARG root_image=alpine:3.19.0 FROM $cert_image AS cert RUN apk add --update --no-cache ca-certificates mailcap From e34f3d000289d3628cea88db5f05cf2bf84b473d Mon Sep 17 00:00:00 2001 From: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> Date: Thu, 16 May 2024 00:27:17 +0530 Subject: [PATCH 4/7] Update Makefile add Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> --- docker/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index 0e0bbc82685..dfb72662a7d 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,4 +1,4 @@ -GOLANG_IMAGE := golang:1.22-alpine +VERSION := 1.0.0 DOCKER_REGISTRY ?= localhost:5000 BASE_IMAGE ?= $(DOCKER_REGISTRY)/baseimg_alpine:latest @@ -14,7 +14,6 @@ create-baseimg: prepare-docker-buildx create-debugimg: prepare-docker-buildx docker buildx build -t $(DEBUG_IMAGE) --push \ - --build-arg golang_image=$(GOLANG_IMAGE) \ --platform=$(PLATFORMS) \ docker/debug From 7f76b24aa132cc6f4e5a2a670ab0fb3b40b14ba1 Mon Sep 17 00:00:00 2001 From: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> Date: Thu, 16 May 2024 00:47:40 +0530 Subject: [PATCH 5/7] Update Dockerfile add Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> --- docker/debug/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/debug/Dockerfile b/docker/debug/Dockerfile index b8e4ddc005d..f7d22170282 100644 --- a/docker/debug/Dockerfile +++ b/docker/debug/Dockerfile @@ -1,4 +1,4 @@ -ARG golang_image +ARG golang_image=golang:1.22-alpine FROM $golang_image AS build ARG TARGETARCH From bfba35805aee83e10e3a058a8715d569976b8968 Mon Sep 17 00:00:00 2001 From: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> Date: Thu, 16 May 2024 07:22:27 +0530 Subject: [PATCH 6/7] Update check-go-version.sh fixed lint errors Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> --- scripts/check-go-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check-go-version.sh b/scripts/check-go-version.sh index c7d2ab06fd4..6d8b4d45bda 100755 --- a/scripts/check-go-version.sh +++ b/scripts/check-go-version.sh @@ -70,7 +70,7 @@ function check() { check go.mod "^go\s\+$version_regex" "$go_previous_version" -check docker/Makefile "^.*golang:$version_regex" "$go_latest_version" +check docker/base/Dockerfile "^.*golang:$version_regex" "$go_latest_version" IFS='|' read -r -a gha_workflows <<< "$(grep -rl go-version .github | tr '\n' '|')" for gha_workflow in "${gha_workflows[@]}"; do From 3299b005a2e23bec9c77475672c405400261e976 Mon Sep 17 00:00:00 2001 From: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> Date: Thu, 16 May 2024 07:32:13 +0530 Subject: [PATCH 7/7] Update check-go-version.sh fix Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com> --- scripts/check-go-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check-go-version.sh b/scripts/check-go-version.sh index 6d8b4d45bda..ef95d52f404 100755 --- a/scripts/check-go-version.sh +++ b/scripts/check-go-version.sh @@ -70,7 +70,7 @@ function check() { check go.mod "^go\s\+$version_regex" "$go_previous_version" -check docker/base/Dockerfile "^.*golang:$version_regex" "$go_latest_version" +check docker/debug/Dockerfile "^.*golang:$version_regex" "$go_latest_version" IFS='|' read -r -a gha_workflows <<< "$(grep -rl go-version .github | tr '\n' '|')" for gha_workflow in "${gha_workflows[@]}"; do