diff options
| -rw-r--r-- | Dockerfile.image | 18 | ||||
| -rw-r--r-- | docker-extras/imagebuilder_run | 10 |
2 files changed, 11 insertions, 17 deletions
diff --git a/Dockerfile.image b/Dockerfile.image index fac0bcd..03f11ed 100644 --- a/Dockerfile.image +++ b/Dockerfile.image @@ -1,8 +1,9 @@ -FROM zynqmp-dom0-kernel-package AS zynqmp-dom0-kernel-package -FROM zynqmp-dom0-ramdisk-package AS zynqmp-dom0-ramdisk-package -FROM zynqmp-domu-0-package AS zynqmp-domu-0-package FROM zynqmp-dt-config-package AS zynqmp-dt-config-package FROM zynqmp-xen-package AS zynqmp-xen-package +FROM zynqmp-dom0-kernel-package AS zynqmp-dom0-kernel-package +FROM zynqmp-dom0-ramdisk-package AS zynqmp-dom0-ramdisk-package +FROM zynqmp-dom1-package AS zynqmp-dom1-package +FROM zynqmp-dom2-package AS zynqmp-dom2-package FROM alpine:3.9 @@ -35,8 +36,9 @@ RUN \ rm -rf /tmp/* && \ rm -f /var/cache/apk/* -COPY --from=zynqmp-dom0-kernel-package /home/builder/output-zynqmp-dom0-kernel/ /home/builder/output-zynqmp-dom0-kernel/ -COPY --from=zynqmp-dom0-ramdisk-package /home/builder/output-zynqmp-dom0-ramdisk/ /home/builder/output-zynqmp-dom0-ramdisk/ -COPY --from=zynqmp-domu-0-package /home/builder/output-zynqmp-domU-0/ /home/builder/output-zynqmp-domU-0/ -COPY --from=zynqmp-dt-config-package /home/builder/output-zynqmp-dt-config/ /home/builder/output-zynqmp-dt-config/ -COPY --from=zynqmp-xen-package /home/builder/output-zynqmp-xen/ /home/builder/output-zynqmp-xen/ +COPY --from=zynqmp-dom0-kernel-package /home/builder/output-zynqmp-dom0-kernel/ /home/builder/output +COPY --from=zynqmp-dom0-ramdisk-package /home/builder/output-zynqmp-dom0-ramdisk/ /home/builder/output +COPY --from=zynqmp-dt-config-package /home/builder/output-zynqmp-dt-config/ /home/builder/output/ +COPY --from=zynqmp-xen-package /home/builder/output-zynqmp-xen/ /home/builder/output +COPY --from=zynqmp-dom1-package /home/builder/output-zynqmp-dom1/ /home/builder/output/zynqmp-dom1/ +COPY --from=zynqmp-dom2-package /home/builder/output-zynqmp-dom2/ /home/builder/output/zynqmp-dom2/ diff --git a/docker-extras/imagebuilder_run b/docker-extras/imagebuilder_run index 40f88c5..22bde52 100644 --- a/docker-extras/imagebuilder_run +++ b/docker-extras/imagebuilder_run @@ -173,16 +173,8 @@ function check_compressed_file_type() rm -rf /tmp/output mkdir /tmp/output - -cd /home/builder -for d in $(ls); do - pushd $d - cp * /tmp/output - popd -done - cd /tmp/output - +cp -r /home/builder/output/* . . config rm -f $UBOOT_SOURCE $UBOOT_SCRIPT |