feat: podman multiarch support #1157

shashank381 · 2024-03-18T17:55:10Z

No description provided.

github-actions · 2024-03-18T17:55:23Z

Thanks for making a pull request! 😃
One of the maintainers will review and advise on the next steps.

kmehant · 2024-03-19T04:32:05Z

...in/transformers/dockerfile/dockerimagebuildscript/templates/buildandpushimages_multiarch.bat

 popd
 {{- end }}

 echo "done"
+
+:SKIP


Add a new line at the end

Thank you. I have added the new line.

codecov · 2024-03-19T08:48:17Z

Codecov Report

Attention: Patch coverage is 0% with 6 lines in your changes are missing coverage. Please review.

Project coverage is 14.82%. Comparing base (3bf7465) to head (3c96f4f).

❗ Current head 3c96f4f differs from pull request most recent head 99e8b8b. Consider uploading reports for the commit 99e8b8b to get more accurate results

Files	Patch %	Lines
common/utils.go	0.00%	6 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1157      +/-   ##
==========================================
+ Coverage   14.79%   14.82%   +0.02%     
==========================================
  Files          90       90              
  Lines        8401     8385      -16     
==========================================
  Hits         1243     1243              
+ Misses       6835     6819      -16     
  Partials      323      323

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

Akash-Nayak

Few suggestions.

Akash-Nayak · 2024-03-19T11:24:16Z

...in/transformers/dockerfile/dockerimagebuildscript/templates/buildandpushimages_multiarch.bat

@@ -29,6 +29,10 @@ if not %basename% == "scripts" (
 REM go to the parent directory so that all the relative paths will be correct
 cd {{ .RelParentOfSourceDir }}

+SET CONTAINER_RUNTIME={{ .ContainerRuntime }}


Similar to the buildimages.bat and pushimages.bat file, we should now also allow the user to choose the container runtime while executing the buildandpushimages_multiarch.bat file.

move2kube/assets/built-in/transformers/dockerfile/dockerimagebuildscript/templates/buildimages.bat

Line 18 in 565394b

:: 2) buildimages.bat podman

move2kube/assets/built-in/transformers/dockerfile/dockerimagebuildscript/templates/buildimages.bat

Line 29 in 565394b

SET CONTAINER_RUNTIME=%1%

move2kube/assets/built-in/transformers/containerimagespushscript/templates/pushimages.bat

Line 19 in 565394b

:: 3) pushimages.bat index.docker.io your_registry_namespace podman

move2kube/assets/built-in/transformers/containerimagespushscript/templates/pushimages.bat

Line 23 in 565394b

SET CONTAINER_RUNTIME=%3%

Then we can also add an example on how to specify the container runtime (along with registry namespace/registry url/platforms) while executing the file .

move2kube/assets/built-in/transformers/dockerfile/dockerimagebuildscript/templates/buildandpushimages_multiarch.bat

Line 19 in 565394b

:: 3) buildandpush_multiarchimages.bat quay.io your_quay_username linux/amd64,linux/arm64,linux/s390x

Thank you, I have made the changes.

Akash-Nayak · 2024-03-19T11:24:21Z

...-in/transformers/dockerfile/dockerimagebuildscript/templates/buildandpushimages_multiarch.sh

@@ -36,13 +36,28 @@ fi
 if [ "$#" -eq 3 ]; then
  PLATFORMS=$3
 fi
+
+CONTAINER_RUNTIME={{ .ContainerRuntime }}


Similar to the buildimages.sh and pushimages.sh file, we should now also allow the user to choose the container runtime while executing the buildandpushimages_multiarch.sh file.

move2kube/assets/built-in/transformers/dockerfile/dockerimagebuildscript/templates/buildimages.sh

Line 19 in 565394b

# 2) ./buildimages.sh podman

move2kube/assets/built-in/transformers/dockerfile/dockerimagebuildscript/templates/buildimages.sh

Line 27 in 565394b

CONTAINER_RUNTIME=$1

move2kube/assets/built-in/transformers/containerimagespushscript/templates/pushimages.sh

Line 20 in 565394b

# 3) ./pushimages.sh index.docker.io your_registry_namespace podman

move2kube/assets/built-in/transformers/containerimagespushscript/templates/pushimages.sh

Line 30 in 565394b

CONTAINER_RUNTIME=$3

Here also we can add an example on how to specify the container runtime (along with registry namespace/registry url/platforms) while executing the file.

move2kube/assets/built-in/transformers/dockerfile/dockerimagebuildscript/templates/buildandpushimages_multiarch.sh

Line 20 in 565394b

# 3) ./buildandpush_multiarchimages.sh quay.io your_quay_username linux/amd64,linux/arm64,linux/s390x

Thank you, I have made the changes.

Akash-Nayak · 2024-03-19T11:43:16Z

Also, @shashank381 can you please add Soumil as the co-author in this PR, as part of this PR has been taken from the original PR #1101.

https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors#creating-co-authored-commits-on-the-command-line

Akash-Nayak

Can you please also test the following scenarios and see if things are working as expected or not -

./buildandpush_multiarchimages.bat podman index.docker.io <your_quay_username> linux/amd64,linux/arm64,linux/s390x
./buildandpush_multiarchimages.bat docker index.docker.io <your_quay_username>
./buildandpush_multiarchimages.bat podman
./buildandpush_multiarchimages.bat

Akash-Nayak · 2024-04-04T17:25:38Z

...in/transformers/dockerfile/dockerimagebuildscript/templates/buildandpushimages_multiarch.bat

+
+IF "%1"=="docker" (
+    shift
+    GOTO DOCKER_CONTAINER_RUNTIME


Because of this GOTO, the code till line 64 will get skipped and even if the user specifies registry url/ registry namespace/ platforms along with the container runtime while running the script, it will get ignored.

Akash-Nayak · 2024-04-04T17:27:33Z

...in/transformers/dockerfile/dockerimagebuildscript/templates/buildandpushimages_multiarch.bat

+)
+IF "%1"=="podman" (
+    shift
+    GOTO PODMAN_CONTAINER_RUNTIME


Because of this GOTO, the code till line 64 will get skipped and even if the user specifies registry url/ registry namespace/ platforms while running the script, it will get ignored.

Akash-Nayak · 2024-04-04T17:31:37Z

...in/transformers/dockerfile/dockerimagebuildscript/templates/buildandpushimages_multiarch.bat

+    GOTO PODMAN_CONTAINER_RUNTIME
+)
+SET CONTAINER_RUNTIME={{ .ContainerRuntime }}
+GOTO DOCKER_CONTAINER_RUNTIME


Because of this GOTO also, the code till line 64 will get skipped and even if the user specifies registry url/ registry namespace/ platforms while running the script, it will get ignored.

Signed-off-by: Soumil Paranjpay <soumil.paranjpay@gmail.com>

Signed-off-by: shashank381 <satholashashank@gmail.com>

shashank381 · 2024-04-04T18:13:27Z

Thank you @Akash-Nayak I have updated the bat file.

Can you please also test the following scenarios and see if things are working as expected or not -

./buildandpush_multiarchimages.bat podman index.docker.io <your_quay_username> linux/amd64,linux/arm64,linux/s390x

./buildandpush_multiarchimages.bat docker index.docker.io <your_quay_username>

./buildandpush_multiarchimages.bat podman

./buildandpush_multiarchimages.bat

I dont have a windows machine to test these cases.

shashank381 · 2024-04-09T18:32:48Z

@Akash-Nayak I have manually validated logic for bat scripts. Thankyou.

Akash-Nayak

LGTM. Thanks @shashank381!

shashank381 mentioned this pull request Mar 18, 2024

feat: use podman for building custom images if executable is found #1101

Open

kmehant changed the title ~~Feat/podman multiarch support~~ feat: podman multiarch support Mar 19, 2024

github-actions bot added the feat label Mar 19, 2024

kmehant requested changes Mar 19, 2024

View reviewed changes

kmehant requested a review from Akash-Nayak March 19, 2024 08:42

HarikrishnanBalagopal added the lfx-project https://lfx.linuxfoundation.org/tools/mentorship/ label Mar 19, 2024

Akash-Nayak requested changes Mar 19, 2024

View reviewed changes

shashank381 force-pushed the feat/podman-multiarch-support branch 2 times, most recently from 1d8dbdf to bd679bf Compare March 21, 2024 14:01

kmehant force-pushed the feat/podman-multiarch-support branch from bd679bf to 3c96f4f Compare March 22, 2024 06:52

kmehant approved these changes Mar 22, 2024

View reviewed changes

Akash-Nayak requested changes Apr 4, 2024

View reviewed changes

Soumil-07 and others added 5 commits April 4, 2024 11:11

feat: use podman for building custom images if executable is found

0ca8652

Signed-off-by: Soumil Paranjpay <soumil.paranjpay@gmail.com>

feat: add support for multiarch with podman

c65d33d

Signed-off-by: shashank381 <satholashashank@gmail.com>

chore: add log statements for container runtime

dcd3525

Signed-off-by: shashank381 <satholashashank@gmail.com>

feat: allow providing container runtime for multi arch scripts

f2f4b45

Signed-off-by: shashank381 <satholashashank@gmail.com>

fix: GOTO flow in bat multiarch file

99e8b8b

Signed-off-by: shashank381 <satholashashank@gmail.com>

shashank381 force-pushed the feat/podman-multiarch-support branch from 3c96f4f to 99e8b8b Compare April 4, 2024 18:11

Akash-Nayak approved these changes Apr 9, 2024

View reviewed changes

Akash-Nayak merged commit f1a2483 into konveyor:main Apr 9, 2024
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: podman multiarch support #1157

feat: podman multiarch support #1157

shashank381 commented Mar 18, 2024

github-actions bot commented Mar 18, 2024

kmehant Mar 19, 2024

shashank381 Mar 21, 2024

codecov bot commented Mar 19, 2024 •

edited

Loading

Akash-Nayak left a comment

Akash-Nayak Mar 19, 2024

Akash-Nayak Mar 19, 2024

shashank381 Mar 21, 2024

Akash-Nayak Mar 19, 2024

Akash-Nayak Mar 19, 2024

shashank381 Mar 21, 2024

Akash-Nayak commented Mar 19, 2024

Akash-Nayak left a comment

Akash-Nayak Apr 4, 2024

Akash-Nayak Apr 4, 2024

Akash-Nayak Apr 4, 2024

shashank381 commented Apr 4, 2024

shashank381 commented Apr 9, 2024

Akash-Nayak left a comment

feat: podman multiarch support #1157

feat: podman multiarch support #1157

Conversation

shashank381 commented Mar 18, 2024

github-actions bot commented Mar 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Mar 19, 2024 • edited Loading

Codecov Report

Akash-Nayak left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Akash-Nayak commented Mar 19, 2024

Akash-Nayak left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shashank381 commented Apr 4, 2024

shashank381 commented Apr 9, 2024

Akash-Nayak left a comment

Choose a reason for hiding this comment

codecov bot commented Mar 19, 2024 •

edited

Loading