Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix alpine image to 3.19.0 #5454

Merged
merged 7 commits into from
May 16, 2024
Merged

Fix alpine image to 3.19.0 #5454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3570f0b
Update Makefile
prakrit55 May 15, 2024
44b068c
Update Makefile
prakrit55 May 15, 2024
3721805
Update Dockerfile
prakrit55 May 15, 2024
e34f3d0
Update Makefile
prakrit55 May 15, 2024
7f76b24
Update Dockerfile
prakrit55 May 15, 2024
bfba358
Update check-go-version.sh
prakrit55 May 16, 2024
3299b00
Update check-go-version.sh
prakrit55 May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
VERSION := 1.0.0
yurishkuro marked this conversation as resolved.
Show resolved Hide resolved
ROOT_IMAGE ?= alpine:3.16
CERT_IMAGE := $(ROOT_IMAGE)
GOLANG_IMAGE := golang:1.22-alpine

DOCKER_REGISTRY ?= localhost:5000
BASE_IMAGE ?= $(DOCKER_REGISTRY)/baseimg_alpine:latest
Expand All @@ -12,14 +9,11 @@ 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

create-debugimg: prepare-docker-buildx
docker buildx build -t $(DEBUG_IMAGE) --push \
--build-arg golang_image=$(GOLANG_IMAGE) \
--platform=$(PLATFORMS) \
docker/debug

Expand Down
4 changes: 2 additions & 2 deletions docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG cert_image
ARG root_image
ARG cert_image=alpine:3.19.0
ARG root_image=alpine:3.19.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dependabot doesn't seem to be able to handle this, it did not raise a PR to upgrade to 3.19.1

I think we need to remove these args altogether and define versions directly in the FROM directive. That dependabot should definitely support.

FROM $cert_image AS cert
RUN apk add --update --no-cache ca-certificates mailcap
Expand Down
2 changes: 1 addition & 1 deletion docker/debug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG golang_image
ARG golang_image=golang:1.22-alpine

FROM $golang_image AS build
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-go-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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
Expand Down
Loading