From d2a5791c651c095b7fe6e9727138d30edbcbf9c4 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Thu, 16 Nov 2017 16:49:24 -0800 Subject: [PATCH] Match containers labels with directory names Signed-off-by: Stefano Stabellini --- alpine-dom0/build.sh | 6 +++--- alpine-dom0/{build-linux => linux-builder}/build.docker | 2 +- alpine-dom0/{build-linux => linux-builder}/linux-config | 0 alpine-dom0/{build-qemu => qemu-builder}/build.docker | 2 +- alpine-dom0/{build-qemu => qemu-builder}/qemu-patch | 0 alpine-dom0/{build-xen => xen-builder}/build.docker | 2 +- alpine-dom0/{build-xen => xen-builder}/xen-patch | 0 mkimage/build.sh | 4 ++-- mkimage/{build-grub => grub-builder}/build.docker | 2 +- .../patches/0001-TPM-build-issue-fixing.patch | 0 ...2-video-Allow-to-set-pure-text-mode-in-case-of-EFI.patch | 0 mkimage/{mkimage => image-builder}/build.docker | 2 +- mkimage/{mkimage => image-builder}/make-efi | 0 13 files changed, 10 insertions(+), 10 deletions(-) rename alpine-dom0/{build-linux => linux-builder}/build.docker (91%) rename alpine-dom0/{build-linux => linux-builder}/linux-config (100%) rename alpine-dom0/{build-qemu => qemu-builder}/build.docker (95%) rename alpine-dom0/{build-qemu => qemu-builder}/qemu-patch (100%) rename alpine-dom0/{build-xen => xen-builder}/build.docker (95%) rename alpine-dom0/{build-xen => xen-builder}/xen-patch (100%) rename mkimage/{build-grub => grub-builder}/build.docker (96%) rename mkimage/{build-grub => grub-builder}/patches/0001-TPM-build-issue-fixing.patch (100%) rename mkimage/{build-grub => grub-builder}/patches/0002-video-Allow-to-set-pure-text-mode-in-case-of-EFI.patch (100%) rename mkimage/{mkimage => image-builder}/build.docker (89%) rename mkimage/{mkimage => image-builder}/make-efi (100%) diff --git a/alpine-dom0/build.sh b/alpine-dom0/build.sh index 399dd02..97591d3 100755 --- a/alpine-dom0/build.sh +++ b/alpine-dom0/build.sh @@ -9,21 +9,21 @@ DOM0_LABEL="dom0" exists=`docker images $XEN_LABEL | grep $XEN_LABEL` if test -z "$exists" then - docker build -f alpine-dom0/build-xen/build.docker -t $XEN_LABEL . + docker build -f alpine-dom0/$XEN_LABEL/build.docker -t $XEN_LABEL . fi # Build QEMU, based on $XEN_LABEL, create $QEMU_LABEL exists=`docker images $QEMU_LABEL | grep $QEMU_LABEL` if test -z "$exists" then - docker build -f alpine-dom0/build-qemu/build.docker -t $QEMU_LABEL . + docker build -f alpine-dom0/$QEMU_LABEL/build.docker -t $QEMU_LABEL . fi # Build Linux, based on $QEMU_LABEL, create $LINUX_LABEL exists=`docker images $LINUX_LABEL | grep $LINUX_LABEL` if test -z "$exists" then - docker build -f alpine-dom0/build-linux/build.docker -t $LINUX_LABEL . + docker build -f alpine-dom0/$LINUX_LABEL/build.docker -t $LINUX_LABEL . fi # Create Dom0, takes build artifacts from $LINUX_LABEL diff --git a/alpine-dom0/build-linux/build.docker b/alpine-dom0/linux-builder/build.docker similarity index 91% rename from alpine-dom0/build-linux/build.docker rename to alpine-dom0/linux-builder/build.docker index 062df25..7b7c95b 100644 --- a/alpine-dom0/build-linux/build.docker +++ b/alpine-dom0/linux-builder/build.docker @@ -1,6 +1,6 @@ FROM qemu-builder as linux-builder -COPY alpine-dom0/build-linux/linux-config /root/ +COPY alpine-dom0/linux-builder/linux-config /root/ ENV SOURCE_DIR=/root ENV OUT_DIR=/out diff --git a/alpine-dom0/build-linux/linux-config b/alpine-dom0/linux-builder/linux-config similarity index 100% rename from alpine-dom0/build-linux/linux-config rename to alpine-dom0/linux-builder/linux-config diff --git a/alpine-dom0/build-qemu/build.docker b/alpine-dom0/qemu-builder/build.docker similarity index 95% rename from alpine-dom0/build-qemu/build.docker rename to alpine-dom0/qemu-builder/build.docker index 689722c..d94b70b 100644 --- a/alpine-dom0/build-qemu/build.docker +++ b/alpine-dom0/qemu-builder/build.docker @@ -1,6 +1,6 @@ FROM xen-builder as qemu-builder -COPY alpine-dom0/build-qemu/qemu-patch /root/ +COPY alpine-dom0/qemu-builder/qemu-patch /root/ ENV SOURCE_DIR=/root ENV OUT_DIR=/out diff --git a/alpine-dom0/build-qemu/qemu-patch b/alpine-dom0/qemu-builder/qemu-patch similarity index 100% rename from alpine-dom0/build-qemu/qemu-patch rename to alpine-dom0/qemu-builder/qemu-patch diff --git a/alpine-dom0/build-xen/build.docker b/alpine-dom0/xen-builder/build.docker similarity index 95% rename from alpine-dom0/build-xen/build.docker rename to alpine-dom0/xen-builder/build.docker index 3e69459..8866e18 100644 --- a/alpine-dom0/build-xen/build.docker +++ b/alpine-dom0/xen-builder/build.docker @@ -1,6 +1,6 @@ FROM alpine as xen-builder -COPY alpine-dom0/build-xen/xen-patch /root/ +COPY alpine-dom0/xen-builder/xen-patch /root/ ENV SOURCE_DIR=/root ENV OUT_DIR=/out diff --git a/alpine-dom0/build-xen/xen-patch b/alpine-dom0/xen-builder/xen-patch similarity index 100% rename from alpine-dom0/build-xen/xen-patch rename to alpine-dom0/xen-builder/xen-patch diff --git a/mkimage/build.sh b/mkimage/build.sh index c53e4d6..f6745b2 100755 --- a/mkimage/build.sh +++ b/mkimage/build.sh @@ -7,14 +7,14 @@ IMAGE_BUILD_LABEL="image-builder" exists=`docker images $GRUB_LABEL | grep $GRUB_LABEL` if test -z "$exists" then - docker build -f mkimage/build-grub/build.docker -t $GRUB_LABEL . + docker build -f mkimage/$GRUB_LABEL/build.docker -t $GRUB_LABEL . fi # Build image builder exists=`docker images $IMAGE_BUILD_LABEL | grep $IMAGE_BUILD_LABEL` if test -z "$exists" then - docker build -f mkimage/mkimage/build.docker -t $IMAGE_BUILD_LABEL . + docker build -f mkimage/$IMAGE_BUILD_LABEL/build.docker -t $IMAGE_BUILD_LABEL . fi # Create system image diff --git a/mkimage/build-grub/build.docker b/mkimage/grub-builder/build.docker similarity index 96% rename from mkimage/build-grub/build.docker rename to mkimage/grub-builder/build.docker index c07f190..2bb9e29 100644 --- a/mkimage/build-grub/build.docker +++ b/mkimage/grub-builder/build.docker @@ -21,7 +21,7 @@ ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto d search_disk_uuid tftp verify xzio xfs video multiboot2 gfxterm efi_gop efi_uga" ENV GRUB_COMMIT=6782f6d431d22b4e9ab14e94d263795c7991e160 -COPY mkimage/build-grub/patches/* /patches/ +COPY mkimage/grub-builder/patches/* /patches/ RUN mkdir /grub-lib && \ set -e && \ diff --git a/mkimage/build-grub/patches/0001-TPM-build-issue-fixing.patch b/mkimage/grub-builder/patches/0001-TPM-build-issue-fixing.patch similarity index 100% rename from mkimage/build-grub/patches/0001-TPM-build-issue-fixing.patch rename to mkimage/grub-builder/patches/0001-TPM-build-issue-fixing.patch diff --git a/mkimage/build-grub/patches/0002-video-Allow-to-set-pure-text-mode-in-case-of-EFI.patch b/mkimage/grub-builder/patches/0002-video-Allow-to-set-pure-text-mode-in-case-of-EFI.patch similarity index 100% rename from mkimage/build-grub/patches/0002-video-Allow-to-set-pure-text-mode-in-case-of-EFI.patch rename to mkimage/grub-builder/patches/0002-video-Allow-to-set-pure-text-mode-in-case-of-EFI.patch diff --git a/mkimage/mkimage/build.docker b/mkimage/image-builder/build.docker similarity index 89% rename from mkimage/mkimage/build.docker rename to mkimage/image-builder/build.docker index 9923367..af141d1 100644 --- a/mkimage/mkimage/build.docker +++ b/mkimage/image-builder/build.docker @@ -18,6 +18,6 @@ RUN \ multipath-tools \ && true -COPY mkimage/mkimage/make-efi / +COPY mkimage/image-builder/make-efi / ENTRYPOINT [ "/bin/sh" ] diff --git a/mkimage/mkimage/make-efi b/mkimage/image-builder/make-efi similarity index 100% rename from mkimage/mkimage/make-efi rename to mkimage/image-builder/make-efi -- 2.39.5