Move coreos-grub build to its own image

Signed-off-by: Avi Deitcher <avi@deitcher.net>
2025-07-19 01:06:27 +00:00 · 2019-04-15 11:23:53 +03:00 · 2019-04-15 11:23:53 +03:00 · d6b80396bb
commit d6b80396bb
parent 2f3e42a68c
5 changed files with 58 additions and 122 deletions
--- a/tools/grub/Dockerfile
+++ b/tools/grub/Dockerfile
@ -0,0 +1,44 @@
+FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS grub-build
+RUN apk add \
+  automake \
+  make \
+  bison \
+  gettext \
+  flex \
+  gcc \
+  git \
+  libtool \
+  libc-dev \
+  linux-headers \
+  python3 \
+  autoconf
+	
+# because python is not available
+RUN ln -s python3 /usr/bin/python
+	
+ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto disk boot crc64 gpt \
+search_disk_uuid tftp verify xzio xfs video"
+ENV GRUB_COMMIT=d3fd939f18446b05d1d5456f23823498a1eb3fb4
+	
+RUN mkdir /grub-lib && \
+  set -e && \
+  git clone https://github.com/coreos/grub.git && \
+  cd grub && \
+  git checkout -b grub-build ${GRUB_COMMIT} && \
+  ./autogen.sh && \
+  ./configure --libdir=/grub-lib --with-platform=efi CFLAGS="-Os -Wno-unused-value" && \
+  make -j "$(getconf _NPROCESSORS_ONLN)" && \
+  make install && \
+  case $(uname -m) in \
+  x86_64) \
+    ./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES} linuxefi; \
+    ;; \
+  aarch64) \
+    ./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \
+    ;; \
+  esac
+
+FROM scratch
+ENTRYPOINT []
+WORKDIR /
+COPY --from=grub-build /grub-lib/*.EFI /
--- a/tools/grub/build.yml
+++ b/tools/grub/build.yml
@ -0,0 +1,5 @@
+image: grub
+network: true
+arches:
+  - arm64
+  - amd64
--- a/tools/mkimage-iso-efi/Dockerfile
+++ b/tools/mkimage-iso-efi/Dockerfile
@ -1,44 +1,6 @@
-FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS grub-build
-RUN apk add \
-  automake \
-  make \
-  bison \
-  gettext \
-  flex \
-  gcc \
-  git \
-  libtool \
-  libc-dev \
-  linux-headers \
-  python3 \
-  autoconf
+FROM linuxkit/grub:a4ba33f2ef880947862eaaeceadb2a51bfebb688 AS grub

-# because python is not available
-RUN ln -s python3 /usr/bin/python
-
-ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto disk boot crc64 gpt \
-search_disk_uuid tftp verify xzio xfs video"
-ENV GRUB_COMMIT=d3fd939f18446b05d1d5456f23823498a1eb3fb4
-
-RUN mkdir /grub-lib && \
-  set -e && \
-  git clone https://github.com/coreos/grub.git && \
-  cd grub && \
-  git checkout -b grub-build ${GRUB_COMMIT} && \
-  ./autogen.sh && \
-  ./configure --libdir=/grub-lib --with-platform=efi CFLAGS="-Os -Wno-unused-value" && \
-  make -j "$(getconf _NPROCESSORS_ONLN)" && \
-  make install && \
-  case $(uname -m) in \
-  x86_64) \
-    ./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES} linuxefi; \
-    ;; \
-  aarch64) \
-    ./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \
-    ;; \
-  esac
-
-FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror
+FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
  alpine-baselayout \
@ -54,6 +16,6 @@ RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
 FROM scratch
 WORKDIR /
 COPY --from=mirror /out/ /
-COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/
+COPY --from=grub /BOOT*.EFI /usr/local/share/
 COPY . .
 ENTRYPOINT [ "/make-efi" ]
--- a/tools/mkimage-qcow2-efi/Dockerfile
+++ b/tools/mkimage-qcow2-efi/Dockerfile
@ -1,44 +1,6 @@
-FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS grub-build
-RUN apk add \
-  autoconf \
-  automake \
-  bison \
-  gcc \
-  gettext \
-  git \
-  flex \
-  libc-dev \
-  libtool \
-  linux-headers \
-  make \
-  python3
+FROM linuxkit/grub:a4ba33f2ef880947862eaaeceadb2a51bfebb688 AS grub

-# because python is not available
-RUN ln -s python3 /usr/bin/python
-
-ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto disk boot crc64 gpt \
-search_disk_uuid tftp verify xzio xfs video"
-ENV GRUB_COMMIT=d3fd939f18446b05d1d5456f23823498a1eb3fb4
-
-RUN mkdir /grub-lib && \
-  set -e && \
-  git clone https://github.com/coreos/grub.git && \
-  cd grub && \
-  git checkout -b grub-build ${GRUB_COMMIT} && \
-  ./autogen.sh && \
-  ./configure --libdir=/grub-lib --with-platform=efi CFLAGS="-Os -Wno-unused-value" && \
-  make -j "$(getconf _NPROCESSORS_ONLN)" && \
-  make install && \
-  case $(uname -m) in \
-  x86_64) \
-    ./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES} linuxefi; \
-    ;; \
-  aarch64) \
-    ./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \
-    ;; \
-  esac
-
-FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror
+FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
  alpine-baselayout \
@ -57,6 +19,6 @@ RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
 FROM scratch
 WORKDIR /
 COPY --from=mirror /out/ /
-COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/
+COPY --from=grub /BOOT*.EFI /usr/local/share/
 COPY . .
 ENTRYPOINT [ "/make-efi" ]
--- a/tools/mkimage-raw-efi/Dockerfile
+++ b/tools/mkimage-raw-efi/Dockerfile
@ -1,43 +1,6 @@
-FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS grub-build
-RUN apk add \
-  autoconf \
-  automake \
-  bison \
-  gcc \
-  gettext \
-  git \
-  flex \
-  libc-dev \
-  libtool \
-  linux-headers \
-  make \
-  python3  
-# because python is not available
-RUN ln -s python3 /usr/bin/python
+FROM linuxkit/grub:a4ba33f2ef880947862eaaeceadb2a51bfebb688 AS grub

-ENV GRUB_MODULES="part_gpt fat ext2 iso9660 gzio linux acpi normal cpio crypto disk boot crc64 gpt \
-search_disk_uuid tftp verify xzio xfs video"
-ENV GRUB_COMMIT=d3fd939f18446b05d1d5456f23823498a1eb3fb4
-
-RUN mkdir /grub-lib && \
-  set -e && \
-  git clone https://github.com/coreos/grub.git && \
-  cd grub && \
-  git checkout -b grub-build ${GRUB_COMMIT} && \
-  ./autogen.sh && \
-  ./configure --libdir=/grub-lib --with-platform=efi CFLAGS="-Os -Wno-unused-value" && \
-  make -j "$(getconf _NPROCESSORS_ONLN)" && \
-  make install && \
-  case $(uname -m) in \
-  x86_64) \
-    ./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES} linuxefi; \
-    ;; \
-  aarch64) \
-    ./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES}; \
-    ;; \
-  esac
-
-FROM linuxkit/alpine:3683c9a66cd4da40bd7d6c7da599b2dcd738b559 AS mirror
+FROM linuxkit/alpine:518c2ed0f398c5508969ac5e033607201fb419ed AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
  alpine-baselayout \
@ -55,6 +18,6 @@ RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
 FROM scratch
 WORKDIR /
 COPY --from=mirror /out/ /
-COPY --from=grub-build /grub-lib/BOOT*.EFI /usr/local/share/
+COPY --from=grub /BOOT*.EFI /usr/local/share/
 COPY . .
 ENTRYPOINT [ "/make-efi" ]