Skip to content

Commit

Permalink
Fix alpine image to 3.19.0 (#5454)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?
fixes: #5450

## Description of the changes
- changed alpine image tag from 3.16 to 3.19.0

## How was this change tested?
- 

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [ ] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `yarn lint` and `yarn test`

---------

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
  • Loading branch information
prakrit55 committed May 16, 2024
1 parent 91cffea commit 5554e34
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
6 changes: 0 additions & 6 deletions docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
VERSION := 1.0.0
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
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

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
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
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

0 comments on commit 5554e34

Please sign in to comment.