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

podvm_mkosi: multistage binaries #2204

Conversation

stevenhorsman
Copy link
Member

Simplify the podvm_mkosi binaries building process by combining the builder and binaries into a single multistage dockerfile

@stevenhorsman stevenhorsman requested a review from a team as a code owner December 11, 2024 11:41
@stevenhorsman
Copy link
Member Author

This has been tested on x86 in my fork: https://github.com/stevenhorsman/cloud-api-adaptor/actions/runs/12256747305

-f ../podvm/Dockerfile.podvm_binaries.fedora ../../
$(if $(filter $(PUSH),true),,-o type=local,dest="./resources/binaries-tree") \
$(DOCKER_OPTS) \
-f ../podvm/Dockerfile.podvm.fedora ../../
Copy link
Member

Choose a reason for hiding this comment

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

Hi @stevenhorsman !

Shouldn't it still use Dockerfile.podvm_binaries.fedora?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry, I renamed this last minute (I created a new one in order to keep the old code untouched before deciding this didn't make sense). I will fix and re-test. thanks for the spot!

FROM ${BUILDER_IMG} AS podvm_builder
ARG ARCH="amd64"
ARG YQ_ARCH="amd64"
# PROTOC_ARCH="x86_64" | "s390_64"
Copy link
Member

Choose a reason for hiding this comment

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

drop that line.

@stevenhorsman stevenhorsman force-pushed the multi-stage-podvm-dockerfile branch from 991ac00 to d203390 Compare December 16, 2024 14:54
Simplify the podvm_mkosi binaries building process
by combining the builder and binaries into a single
multistage dockerfile

Signed-off-by: stevenhorsman <[email protected]>
@stevenhorsman stevenhorsman force-pushed the multi-stage-podvm-dockerfile branch from d203390 to 1b86606 Compare December 17, 2024 14:52
@mkulke mkulke merged commit 7223c69 into confidential-containers:main Dec 17, 2024
22 checks passed
@stevenhorsman stevenhorsman deleted the multi-stage-podvm-dockerfile branch December 17, 2024 21:33
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.

3 participants