github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3134 from rn/tools-fix

Browse Source 
Fix mkimage- builds
This commit is contained in:
Rolf Neugebauer 2018-07-24 23:57:17 +01:00 committed by GitHub
commit 1f9b598b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 88 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmd/linuxkit/moby/output.go
View File

@ -16,13 +16,13 @@ import (
var ( var (
outputImages = map[string]string{ outputImages = map[string]string{
"iso-bios": "linuxkit/mkimage-iso-bios:fd0092700bc19ea36cc8dccccc9799b7847b4909", "iso-bios": "linuxkit/mkimage-iso-bios:65254243f003cf0ac74c64b0a23b543195ddad8a",
"iso-efi": "linuxkit/mkimage-iso-efi:79148c60bbf2a9526d976d708840492d85b0c576", "iso-efi": "linuxkit/mkimage-iso-efi:1f5556e56da8e82d52458667ad354b719f314eb2",
"raw-bios": "linuxkit/mkimage-raw-bios:0ff04de5d11a88b0712cdc85b2ee5f0b966ffccf", "raw-bios": "linuxkit/mkimage-raw-bios:2795f6282bdb8582934d5a0c2f1f859d3073336c",
"raw-efi": "linuxkit/mkimage-raw-efi:084f159cb44dc6c22351a70f1c1a043857be4e12", "raw-efi": "linuxkit/mkimage-raw-efi:21fbe24aa2a9c6b2d5847da5b7337f727e31339c",
"squashfs": "linuxkit/mkimage-squashfs:36f3fa106cfb7f8b818a828d7aebb27f946c9526", "squashfs": "linuxkit/mkimage-squashfs:9e3c0c2788665a54b949e79ebaacf66297ebd4df",
"gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1", "gcp": "linuxkit/mkimage-gcp:e6cdcf859ab06134c0c37a64ed5f886ec8dae1a1",
"qcow2-efi": "linuxkit/mkimage-qcow2-efi:0eb853459785fad0b518d8edad3b7434add6ad96", "qcow2-efi": "linuxkit/mkimage-qcow2-efi:6a886a3f82d6d166f4ae540203cb3dffbc4cc12d",
"vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242", "vhd": "linuxkit/mkimage-vhd:3820219e5c350fe8ab2ec6a217272ae82f4b9242",
"dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6", "dynamic-vhd": "linuxkit/mkimage-dynamic-vhd:743ac9959fe6d3912ebd78b4fd490b117c53f1a6",
"vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5", "vmdk": "linuxkit/mkimage-vmdk:cee81a3ed9c44ae446ef7ebff8c42c1e77b3e1b5",

23
tools/mkimage-iso-bios/Dockerfile
View File

@ -1,13 +1,16 @@
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc as mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN \ RUN apk add --no-cache --initdb -p /out \
apk update && apk upgrade && \ alpine-baselayout \
apk add --no-cache \ busybox \
libarchive-tools \ cdrkit \
cdrkit \ libarchive-tools \
syslinux \ syslinux \
&& true && true
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
FROM scratch
WORKDIR /
COPY --from=mirror /out/ /
COPY . . COPY . .
ENTRYPOINT [ "/make-iso" ] ENTRYPOINT [ "/make-iso" ]

20
tools/mkimage-iso-efi/Dockerfile
View File

@ -1,5 +1,4 @@
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build
RUN apk add \ RUN apk add \
automake \ automake \
make \ make \
@ -39,19 +38,22 @@ RUN mkdir /grub-lib && \
;; \ ;; \
esac esac
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS make-img FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN \ RUN apk add --no-cache --initdb -p /out \
apk update && apk upgrade && \ alpine-baselayout \
apk add --no-cache \ binutils \
busybox \
dosfstools \ dosfstools \
libarchive-tools \ libarchive-tools \
binutils \
mtools \ mtools \
xorriso \ xorriso \
&& true && true
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
COPY . . FROM scratch
WORKDIR /
COPY --from=mirror /out/ /
COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/ COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/
COPY . .
ENTRYPOINT [ "/make-efi" ] ENTRYPOINT [ "/make-efi" ]

35
tools/mkimage-qcow2-efi/Dockerfile
View File

@ -1,19 +1,17 @@
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build
RUN apk add \ RUN apk add \
autoconf \
automake \ automake \
make \
bison \ bison \
gettext \
flex \
gcc \ gcc \
gettext \
git \ git \
libtool \ flex \
libc-dev \ libc-dev \
libtool \
linux-headers \ linux-headers \
python3 \ make \
python3
autoconf
# because python is not available # because python is not available
RUN ln -s python3 /usr/bin/python RUN ln -s python3 /usr/bin/python
@ -40,22 +38,25 @@ RUN mkdir /grub-lib && \
;; \ ;; \
esac esac
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS make-img FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN \ RUN apk add --no-cache --initdb -p /out \
apk update && apk upgrade && \ alpine-baselayout \
apk add --no-cache \ binutils \
busybox \
dosfstools \ dosfstools \
libarchive-tools \ libarchive-tools \
binutils \
mtools \ mtools \
qemu-img \
sfdisk \ sfdisk \
sgdisk \ sgdisk \
xfsprogs \ xfsprogs \
qemu-img \
&& true && true
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
COPY . . FROM scratch
WORKDIR /
COPY --from=mirror /out/ /
COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/ COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/
COPY . .
ENTRYPOINT [ "/make-efi" ] ENTRYPOINT [ "/make-efi" ]

25
tools/mkimage-raw-bios/Dockerfile
View File

@ -1,14 +1,17 @@
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN \ RUN apk add --no-cache --initdb -p /out \
apk update && apk upgrade && \ alpine-baselayout \
apk add --no-cache \ busybox \
dosfstools \ dosfstools \
libarchive-tools \ libarchive-tools \
sfdisk \ sfdisk \
syslinux \ syslinux \
&& true && true
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
FROM scratch
WORKDIR /
COPY --from=mirror /out/ /
COPY . . COPY . .
ENTRYPOINT [ "/make-bios" ] ENTRYPOINT [ "/make-bios" ]

34
tools/mkimage-raw-efi/Dockerfile
View File

@ -1,20 +1,17 @@
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS grub-build
RUN apk add \ RUN apk add \
autoconf \
automake \ automake \
make \
bison \ bison \
gettext \
flex \
gcc \ gcc \
gettext \
git \ git \
libtool \ flex \
libc-dev \ libc-dev \
libtool \
linux-headers \ linux-headers \
python3 \ make \
python3
autoconf
# because python is not available # because python is not available
RUN ln -s python3 /usr/bin/python RUN ln -s python3 /usr/bin/python
@ -40,21 +37,24 @@ RUN mkdir /grub-lib && \
;; \ ;; \
esac esac
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS make-img FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN \ RUN apk add --no-cache --initdb -p /out \
apk update && apk upgrade && \ alpine-baselayout \
apk add --no-cache \ binutils \
busybox \
dosfstools \ dosfstools \
libarchive-tools \ libarchive-tools \
binutils \
mtools \ mtools \
sfdisk \ sfdisk \
sgdisk \ sgdisk \
xfsprogs \ xfsprogs \
&& true && true
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
COPY . . FROM scratch
WORKDIR /
COPY --from=mirror /out/ /
COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/ COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/
COPY . .
ENTRYPOINT [ "/make-efi" ] ENTRYPOINT [ "/make-efi" ]

15
tools/mkimage-squashfs/Dockerfile
View File

@ -1,12 +1,15 @@
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN \ RUN apk add --no-cache --initdb -p /out \
apk update && apk upgrade && \ alpine-baselayout \
apk add --no-cache \ busybox \
libarchive-tools \ libarchive-tools \
squashfs-tools \ squashfs-tools \
&& true && true
RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
FROM scratch
WORKDIR /
COPY --from=mirror /out/ /
COPY . . COPY . .
ENTRYPOINT [ "/make-squashfs" ] ENTRYPOINT [ "/make-squashfs" ]