Skip to content

Conversation

@kspeeyu
Copy link
Contributor

@kspeeyu kspeeyu commented Aug 4, 2023

Issue #, if available:

Description of changes:
Currently docker image template is available for alpine only
creating similar templates for the following platforms,

  • AL2
  • AL2-generic
  • AL2023

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@lutkerd
Copy link
Contributor

lutkerd commented Aug 4, 2023

How did you test that all of the docker files are updated correctly?

&& yum clean all

ENV LANG C.UTF-8
ENV JAVA_HOME=/usr/lib/jvm/java-{{MAJOR_VERSION}}-amazon-corretto
Copy link
Contributor

Choose a reason for hiding this comment

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

Think when it is JDK8 you need to use 1.8.0 for the java_home and not just the major_version.

Copy link
Contributor Author

@kspeeyu kspeeyu Aug 4, 2023

Choose a reason for hiding this comment

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

right I will fix it

&& CORRETO_TEMP=$(mktemp -d) \
&& pushd ${CORRETO_TEMP} \
{% if jre %}
&& RPM_LIST=("java-{{JDK_VERSION}}-amazon-corretto-$version.amzn2.$(uname -m).rpm") \
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it would simplify the code if you eliminate JDK_VERSION and just set MAJOR_VERSION to 1.8.0 when its 8. Is that possible or are those values too overloaded?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can try that and see if everything builds correctly

@kspeeyu
Copy link
Contributor Author

kspeeyu commented Aug 4, 2023

How did you test that all of the docker files are updated correctly?

verify_update func checks the updated images count,
building the images and comparing to the existing ones in the repo?

update: verified manually docker images build as expected (to the images currently in repo)

@kspeeyu kspeeyu requested a review from lutkerd September 18, 2023 18:15
Copy link
Contributor

@lutkerd lutkerd left a comment

Choose a reason for hiding this comment

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

Please run apply-templace and include any changes to generated Dockerfiles.

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.

2 participants