diff options
| author | Stefano Stabellini | 2019-07-15 16:07:57 -0700 |
|---|---|---|
| committer | Stefano Stabellini | 2019-08-01 14:57:24 -0700 |
| commit | 9ab1b1d15ff41829385e65555592cac08448d1e0 (patch) | |
| tree | 0ee848bfe78d92d7563ddd581b713a2b2010477c /Dockerfile.image | |
| parent | 83334cb46f749091c66fa426b6e6c0b758ac208a (diff) | |
Call disk_image from imagebuilder_run, introduce imagebuilder_sd
Signed-off-by: Stefano Stabellini <stefanos@xilinx.com>
Diffstat (limited to 'Dockerfile.image')
| -rw-r--r-- | Dockerfile.image | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/Dockerfile.image b/Dockerfile.image index 489275b..32b7f61 100644 --- a/Dockerfile.image +++ b/Dockerfile.image @@ -1,9 +1,9 @@ -# 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 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 @@ -33,17 +33,23 @@ RUN \ uboot-tools && \ \ # Copy run file - cp /tmp/docker-build/imagebuilder_run /imagebuilder_run && \ - chmod 755 /imagebuilder_run && \ + cp /tmp/docker-build/imagebuilder_tftp /imagebuilder_tftp && \ + cp /tmp/docker-build/imagebuilder_sd /imagebuilder_sd && \ + cp /tmp/docker-build/uboot-script-gen /uboot-script-gen && \ + cp /tmp/docker-build/disk_image /disk_image && \ + chmod 755 /imagebuilder_tftp && \ + chmod 755 /imagebuilder_sd && \ + chmod 755 /uboot-script-gen && \ + chmod 755 /disk_image && \ \ # cleanup cd /root && \ rm -rf /tmp/* && \ rm -f /var/cache/apk/* -# 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/ +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/ |