✨ Move Earthly logic into Dockerfiles #2008
Conversation
mauromorales
force-pushed
the
1897-full-kairos-Dockerfile
branch
from
8bca420
to
ac2bdbe
Compare
mauromorales
force-pushed
the
1897-full-kairos-Dockerfile
branch
from
9ea4c4d
to
cb90777
Compare
mauromorales
force-pushed
the
1897-full-kairos-Dockerfile
branch
2 times, most recently
from
85d279a
to
d10ef9d
Compare
|
I cannot test the Nvidia image, but I've uploaded it here to |
| @@ -338,15 +338,5 @@ | |||
| "baseImage": "rockylinux:9", | |||
| "arch": "amd64", | |||
| "worker": "self-hosted" | |||
| }, | |||
| { | |||
| "family": "nvidia", | |||
There was a problem hiding this comment.
I removed it from the flavors because this one is no longer a family/distribution of its own but instead it uses the ubuntu family via the BYOI. See image-arm.yaml and release.yaml to see how the two work together
| @@ -57,6 +57,84 @@ jobs: | |||
| # end of optional handling for multi line json | |||
| echo "::set-output name=matrix::{\"include\": $content }" | |||
|
|
|||
| build-nvidia-base: | |||
There was a problem hiding this comment.
the nvidia base image will only be built if its dockerfile changed or if it's a release (see release-arm.yaml). This will save some runners time and I would actually like to do something similar with all other base images so I created a ticket for this #2034
| run: | | ||
| docker push quay.io/kairos/ubuntu:nvidia-jetson-agx-orin-master | ||
|
|
||
| nvidia-arm-core: |
There was a problem hiding this comment.
nvidia now is just consuming the factory with the ubuntu family and passing its base image
| --IMG_COMPRESSION=${{env.IMG_COMPRESSION}} | ||
| - name: Show img sizes | ||
| run: | | ||
| ls -ltra build | ||
| ls -ltrh build | ||
| - name: Convert all json files into a reports.tar.gz file |
There was a problem hiding this comment.
extended it so it can also be used on release-arm.yaml
| rc-update add fail2ban | ||
|
|
||
| # Symlinks to make elemental installer work | ||
| RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install && \ |
There was a problem hiding this comment.
done on the kairos section now
| ############################################################### | ||
| #### Post-Process Common to All #### | ||
| ############################################################### | ||
| FROM all | ||
| RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install |
There was a problem hiding this comment.
done in kairos section now
| @@ -0,0 +1,86 @@ | |||
| # WARNING: Do not build this image on its own, use the different Dockerfile.kairos-* instead | |||
There was a problem hiding this comment.
this is not an independent image but the section that needs to run after the different family/distribution dockerfiles. At first I had this as an independent dockerfile that can run by passing a base image, however Earthly does not play well with local images, so for now I am using the target +kairos-dockerfile to concat the necessary family/distro dockerfile and this file. This is not ideal but I think it's a good step in the right direction, if we then publish base images #2034 then we can convert this one to a proper dockerfile and remove the target, plus the whole thing should be much faster
| RUN rm -rf /etc/apt/sources.list.d/nvidia-l4t-apt-source.list | ||
|
|
||
| # Symlinks to make installer work | ||
| RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install && \ |
There was a problem hiding this comment.
this is now done in the kairos section
| ARG FRAMEWORK_VERSION=master | ||
| # Not to be confused with the concept of MODEL, this is either fips or generic | ||
| ARG SECURITY_PROFILE=generic |
There was a problem hiding this comment.
these are only here because I need to concat the files using the +kairos-dockerfile target, once #2034 is address they can be removed
mauromorales
changed the title
| # Regenerate initrd if necessary | ||
| RUN if [ -f "/usr/bin/dracut" ]; then \ | ||
| kernel=$(ls /lib/modules | head -n1) && \ | ||
| dracut -f "/boot/initrd-${kernel}" "${kernel}" && \ |
There was a problem hiding this comment.
should we just force dracut to overwrite the existing /boot/initrd directly?? that avoids one extra step here to link it.
There was a problem hiding this comment.
@Itxaka hmm, sounds like a good idea, how does that work? for alpine if I understood correctly we would just need to remove the --no-scripts flag right?
There was a problem hiding this comment.
No, I meant that on alpine we generate the file directly overwriting anything while on dracut we generate a file and then soft link it for some reason? Dracut should be able to overwrite the file directly, so we don't need to link it afterwards
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
mauromorales
force-pushed
the
1897-full-kairos-Dockerfile
branch
from
316ffc6
to
5ff0d97
Compare
Fixes #1897