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.

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: changed alpine image from 3.16 to 3.19.0 #5453

Closed
wants to merge 9 commits into from

Conversation

prakrit55
Copy link
Contributor

@prakrit55 prakrit55 commented May 15, 2024

Which problem is this PR solving?

fix: #5450

Description of the changes

  • changed alpine image tag from 3.16 to 3.19.0

How was this change tested?

Checklist

change alpine image from 3.16 to 3.16.9

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
change alpine image in makefile

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
@prakrit55 prakrit55 requested a review from a team as a code owner May 15, 2024 16:30
@prakrit55 prakrit55 requested a review from jkowall May 15, 2024 16:30
@varshith257
Copy link
Contributor

@prakrit55 I think it's not satisfying the issue requirements of what @yurishkuro intended:

Instead of doing this manually, we should have dependabot do the upgrades automatically. However, I see that the image version is currently hardcoded in the Makefile, which dependabot probably won't be able to handle. it would be great to find a way to keep the version defined directly in some Dockerfile.

@yurishkuro
Copy link
Member

I think it's not satisfying the issue requirements

It's fine to independently do a one-time manual upgrade.

changed alpine image tag from 3.16 to 3.16.9

Please read the issue description more carefully.

Copy link

codecov bot commented May 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 37.88%. Comparing base (afd39dd) to head (b29829b).

Additional details and impacted files
@@             Coverage Diff             @@
##             main    #5453       +/-   ##
===========================================
- Coverage   95.46%   37.88%   -57.59%     
===========================================
  Files         331      160      -171     
  Lines       16113     8343     -7770     
===========================================
- Hits        15383     3161    -12222     
- Misses        556     4877     +4321     
- Partials      174      305      +131     
Flag Coverage Δ
badger_v1 8.07% <ø> (ø)
badger_v2 1.94% <ø> (?)
cassandra-3.x-v1 16.48% <ø> (ø)
cassandra-3.x-v2 1.86% <ø> (ø)
cassandra-4.x-v1 16.48% <ø> (ø)
cassandra-4.x-v2 1.86% <ø> (ø)
elasticsearch-7.x 1.78% <ø> (ø)
elasticsearch-8.x 1.77% <ø> (-0.02%) ⬇️
grpc_v1 9.12% <ø> (ø)
grpc_v2 7.49% <ø> (ø)
kafka 9.81% <ø> (ø)
opensearch-1.x 1.78% <ø> (ø)
opensearch-2.x 1.78% <ø> (+0.01%) ⬆️
unittests ?

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@prakrit55
Copy link
Contributor Author

prakrit55 commented May 15, 2024

@prakrit55 I think it's not satisfying the issue requirements of what @yurishkuro intended:

Instead of doing this manually, we should have dependabot do the upgrades automatically. However, I see that the image version is currently hardcoded in the Makefile, which dependabot probably won't be able to handle. it would be great to find a way to keep the version defined directly in some Dockerfile.

I think it's not satisfying the issue requirements

It's fine to independently do a one-time manual upgrade.

changed alpine image tag from 3.16 to 3.16.9

Please read the issue description more carefully.

my bad @yurishkuro WDYT, which alpine image tag would be more compatible... is it the latest

@varshith257
Copy link
Contributor

Refer this => https://alpinelinux.org/releases/

v3.19 is the latest stable version

@prakrit55
Copy link
Contributor Author

@prakrit55 I think it's not satisfying the issue requirements of what @yurishkuro intended:

Instead of doing this manually, we should have dependabot do the upgrades automatically. However, I see that the image version is currently hardcoded in the Makefile, which dependabot probably won't be able to handle. it would be great to find a way to keep the version defined directly in some Dockerfile.

I think it's not satisfying the issue requirements

It's fine to independently do a one-time manual upgrade.

changed alpine image tag from 3.16 to 3.16.9

Please read the issue description more carefully.

my bad @yurishkuro WDYT, which alpine image tag would be more satisfying... is it the latest

Refer this => https://alpinelinux.org/releases/

v3.19 is the latest stable version

yes much thought of it, thanks

fixing alpine image version from 3.16 to 3.19

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
fixing alpine image in makefile from 3.16 to 3.19

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
@prakrit55 prakrit55 changed the title fix: changed alpine image from 3.16 to 3.16.9 fix: changed alpine image from 3.16 to 3.19 May 15, 2024
docker/Makefile Outdated
@@ -1,5 +1,5 @@
VERSION := 1.0.0
ROOT_IMAGE ?= alpine:3.16
ROOT_IMAGE ?= alpine:3.19
Copy link
Member

Choose a reason for hiding this comment

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

for repeatable builds we should be using exact version, in this case 3.19.1

@@ -1,9 +1,9 @@
ARG cert_image
ARG root_image

FROM $cert_image AS cert
FROM alpine:3.19 AS cert
Copy link
Member

Choose a reason for hiding this comment

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

what was the reason a variable was used?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

since the the CERT_IMAGE is based on the ROOT_IMAGE in the makefile, shouldn't we change it here too

Copy link
Member

Choose a reason for hiding this comment

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

I would remove all 3 variables that define versions from the Makefile (and places where they are passed in) and just give default values to the vars

 changing alpine image to 3.19.1 in makefile

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
@@ -1,9 +1,9 @@
ARG cert_image
ARG root_image
Copy link
Member

Choose a reason for hiding this comment

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

use ARG VARIABLE_NAME=default_value

Copy link
Member

Choose a reason for hiding this comment

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

and let's use 3.19.0, not 3.19.1, this will give us a chance to test dependabot upgrading it to 3.19.1

fixing alpine image

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
@prakrit55 prakrit55 changed the title fix: changed alpine image from 3.16 to 3.19 fix: changed alpine image from 3.16 to 3.19.1 May 15, 2024
@@ -1,5 +1,5 @@
VERSION := 1.0.0
ROOT_IMAGE ?= alpine:3.16
ROOT_IMAGE ?= alpine:3.19.1
CERT_IMAGE := $(ROOT_IMAGE)
GOLANG_IMAGE := golang:1.22-alpine
Copy link
Member

Choose a reason for hiding this comment

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

remove all 3 vars

Copy link
Contributor Author

Choose a reason for hiding this comment

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

should I remove the arg declaration used in building the image too

removed root_image and cert_image vars and their usable functions from makefile

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
fixed image in dockerfile

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
revising to alpine:3.19.0

Signed-off-by: Prakriti Mandal <98270250+prakrit55@users.noreply.github.com>
@prakrit55 prakrit55 changed the title fix: changed alpine image from 3.16 to 3.19.1 fix: changed alpine image from 3.16 to 3.19.0 May 15, 2024
@prakrit55 prakrit55 closed this May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature]: can we upgrade the base image of jaeger-query?
3 participants