diff --git a/kernel-ch/Dockerfile b/kernel-ch/Dockerfile index 89e560c..339f4f0 100644 --- a/kernel-ch/Dockerfile +++ b/kernel-ch/Dockerfile @@ -41,4 +41,4 @@ RUN cp arch/x86/boot/compressed/vmlinux.bin ./output/vmlinux.bin&& \ FROM scratch LABEL org.opencontainers.image.source=https://github.com/liquidmetal-dev/mikrolite-images -COPY --from=builder /usr/src/linux/output /boot +COPY --from=builder /usr/src/linux/output / diff --git a/kernel-fc/Dockerfile b/kernel-fc/Dockerfile index 299ad19..bfeaa59 100644 --- a/kernel-fc/Dockerfile +++ b/kernel-fc/Dockerfile @@ -42,4 +42,4 @@ RUN cp vmlinux /boot/vmlinux && \ FROM scratch LABEL org.opencontainers.image.source=https://github.com/liquidmetal-dev/mikrolite-images -COPY --from=builder /boot /boot \ No newline at end of file +COPY --from=builder /boot / \ No newline at end of file diff --git a/kernel-k8s-ch/Dockerfile b/kernel-k8s-ch/Dockerfile index 0790751..6db88d7 100644 --- a/kernel-k8s-ch/Dockerfile +++ b/kernel-k8s-ch/Dockerfile @@ -44,4 +44,4 @@ RUN cp arch/x86/boot/compressed/vmlinux.bin ./output/vmlinux.bin&& \ FROM scratch LABEL org.opencontainers.image.source=https://github.com/liquidmetal-dev/mikrolite-images -COPY --from=builder /usr/src/linux/output /boot +COPY --from=builder /usr/src/linux/output / diff --git a/kernel-k8s-fc/Dockerfile b/kernel-k8s-fc/Dockerfile index 2357503..d245f07 100644 --- a/kernel-k8s-fc/Dockerfile +++ b/kernel-k8s-fc/Dockerfile @@ -43,4 +43,4 @@ RUN cp vmlinux /boot/vmlinux && \ FROM scratch LABEL org.opencontainers.image.source=https://github.com/liquidmetal-dev/mikrolite-images -COPY --from=builder /boot /boot \ No newline at end of file +COPY --from=builder /boot / \ No newline at end of file diff --git a/rke2/Dockerfile b/rke2/Dockerfile index 252b73e..43bebf9 100644 --- a/rke2/Dockerfile +++ b/rke2/Dockerfile @@ -1,10 +1,5 @@ ARG RKE2_VERSION="v1.28.3+rke2r1" -# this is a temporary hack to ensure the kernel config is in the right place -# otherwise modprobe will fail. In the future we can mount the kernel image -# using cloud-init / ignition -FROM ghcr.io/liquidmetal-dev/cloudhypervisor-kernel:6.2 AS kernel - FROM ubuntu:22.04 LABEL org.opencontainers.image.source=https://github.com/liquidmetal-dev/mikrolite-images @@ -41,6 +36,4 @@ RUN mkdir /root/rke2-artifacts && \ curl -OLs https://github.com/rancher/rke2/releases/download/${RKE2_VERSION}/sha256sum-amd64.txt && \ curl -sfL https://get.rke2.io --output install.sh -# To run the install: INSTALL_RKE2_ARTIFACT_PATH=/root/rke2-artifacts sh install.sh - -COPY --from=kernel /boot /boot \ No newline at end of file +# To run the install: INSTALL_RKE2_ARTIFACT_PATH=/root/rke2-artifacts sh install.sh \ No newline at end of file