Merge pull request #1088 from justincormack/move-base

Move base images directory to top level
2025-09-06 09:21:28 +00:00 · 2017-01-24 20:48:36 +00:00
parent b53e83d695 f8e0a3d61c
commit b33cee3fc7
96 changed files with 3 additions and 3 deletions
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -28,7 +28,7 @@ GCE_IMAGE=mobylinux/mkimage-gce@sha256:f9abf2eae20984b7dd3c1afb700b2c9c41e39e6e7
 moby.img: Dockerfile mkinitrd.sh init $(ETCFILES)
 	$(MAKE) -C kernel
 	$(MAKE) -j -C packages
-	$(MAKE) -C base/ebpf
+	$(MAKE) -C ebpf
 	printf $(TAG)$(DIRTY) > etc/moby-commit
 	BUILD=$$( tar cf - \
 	  Dockerfile etc usr init mkinitrd.sh \
@@ -216,6 +216,6 @@ clean:
 	$(MAKE) -C containers clean
 	$(MAKE) -C test clean
 	$(MAKE) -C kernel clean
-	$(MAKE) -C base/ebpf clean
+	$(MAKE) -C ebpf clean
 .DELETE_ON_ERROR:
--- a/alpine/base/ebpf/Dockerfile
+++ b/alpine/base/ebpf/Dockerfile
--- a/alpine/base/ebpf/Makefile
+++ b/alpine/base/ebpf/Makefile
@@ -1,4 +1,4 @@
-KERNEL_FILES=-C ../../kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar
+KERNEL_FILES=-C ../kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar
 default: ebpf.tag
--- a/alpine/base/.gitignore
+++ b/alpine/base/.gitignore
--- a/alpine/base/Makefile
+++ b/alpine/base/Makefile
--- a/alpine/base/alpine-aws/Dockerfile
+++ b/alpine/base/alpine-aws/Dockerfile
--- a/alpine/base/alpine-aws/Makefile
+++ b/alpine/base/alpine-aws/Makefile
--- a/alpine/base/alpine-base/Dockerfile
+++ b/alpine/base/alpine-base/Dockerfile
--- a/alpine/base/alpine-base/Makefile
+++ b/alpine/base/alpine-base/Makefile
--- a/alpine/base/alpine-base/packages
+++ b/alpine/base/alpine-base/packages
--- a/alpine/base/alpine-base/repositories
+++ b/alpine/base/alpine-base/repositories
--- a/alpine/base/alpine-build-c/Dockerfile
+++ b/alpine/base/alpine-build-c/Dockerfile
--- a/alpine/base/alpine-build-c/Makefile
+++ b/alpine/base/alpine-build-c/Makefile
--- a/alpine/base/alpine-build-ebpf/100-musl-compat.patch
+++ b/alpine/base/alpine-build-ebpf/100-musl-compat.patch
--- a/alpine/base/alpine-build-ebpf/Dockerfile
+++ b/alpine/base/alpine-build-ebpf/Dockerfile
--- a/alpine/base/alpine-build-ebpf/Makefile
+++ b/alpine/base/alpine-build-ebpf/Makefile
--- a/alpine/base/alpine-build-ebpf/bcc-gnuism.patch
+++ b/alpine/base/alpine-build-ebpf/bcc-gnuism.patch
--- a/alpine/base/alpine-build-ebpf/cdefs.h
+++ b/alpine/base/alpine-build-ebpf/cdefs.h
--- a/alpine/base/alpine-build-ebpf/decl.patch
+++ b/alpine/base/alpine-build-ebpf/decl.patch
--- a/alpine/base/alpine-build-ebpf/error.h
+++ b/alpine/base/alpine-build-ebpf/error.h
--- a/alpine/base/alpine-build-ebpf/intl.patch
+++ b/alpine/base/alpine-build-ebpf/intl.patch
--- a/alpine/base/alpine-build-ebpf/temp_failure.patch
+++ b/alpine/base/alpine-build-ebpf/temp_failure.patch
--- a/alpine/base/alpine-build-toybox/Dockerfile
+++ b/alpine/base/alpine-build-toybox/Dockerfile
--- a/alpine/base/alpine-build-toybox/Makefile
+++ b/alpine/base/alpine-build-toybox/Makefile
--- a/alpine/base/alpine-build-toybox/build.sh
+++ b/alpine/base/alpine-build-toybox/build.sh
--- a/alpine/base/alpine-efi/Dockerfile
+++ b/alpine/base/alpine-efi/Dockerfile
--- a/alpine/base/alpine-efi/Makefile
+++ b/alpine/base/alpine-efi/Makefile
--- a/alpine/base/alpine-qemu/Dockerfile
+++ b/alpine/base/alpine-qemu/Dockerfile
--- a/alpine/base/alpine-qemu/Makefile
+++ b/alpine/base/alpine-qemu/Makefile
--- a/alpine/base/binfmt/.gitignore
+++ b/alpine/base/binfmt/.gitignore
--- a/alpine/base/binfmt/Dockerfile
+++ b/alpine/base/binfmt/Dockerfile
--- a/alpine/base/binfmt/Makefile
+++ b/alpine/base/binfmt/Makefile
--- a/alpine/base/binfmt/etc/binfmt.d/00_moby.conf
+++ b/alpine/base/binfmt/etc/binfmt.d/00_moby.conf
--- a/alpine/base/binfmt/main.go
+++ b/alpine/base/binfmt/main.go
--- a/alpine/base/c-compile/Dockerfile
+++ b/alpine/base/c-compile/Dockerfile
--- a/alpine/base/c-compile/Makefile
+++ b/alpine/base/c-compile/Makefile
--- a/alpine/base/c-compile/compile.sh
+++ b/alpine/base/c-compile/compile.sh
--- a/alpine/base/ca-certificates/Dockerfile
+++ b/alpine/base/ca-certificates/Dockerfile
--- a/alpine/base/ca-certificates/Makefile
+++ b/alpine/base/ca-certificates/Makefile
--- a/alpine/base/check-config/Dockerfile
+++ b/alpine/base/check-config/Dockerfile
--- a/alpine/base/check-config/Makefile
+++ b/alpine/base/check-config/Makefile
--- a/alpine/base/check-kernel-config/Dockerfile
+++ b/alpine/base/check-kernel-config/Dockerfile
--- a/alpine/base/check-kernel-config/Makefile
+++ b/alpine/base/check-kernel-config/Makefile
--- a/alpine/base/check-kernel-config/check-kernel-config.sh
+++ b/alpine/base/check-kernel-config/check-kernel-config.sh
--- a/alpine/base/containerd/Dockerfile
+++ b/alpine/base/containerd/Dockerfile
--- a/alpine/base/containerd/Makefile
+++ b/alpine/base/containerd/Makefile
--- a/alpine/base/go-compile/Dockerfile
+++ b/alpine/base/go-compile/Dockerfile
--- a/alpine/base/go-compile/Makefile
+++ b/alpine/base/go-compile/Makefile
--- a/alpine/base/go-compile/compile.sh
+++ b/alpine/base/go-compile/compile.sh
--- a/alpine/base/guestfs/Dockerfile
+++ b/alpine/base/guestfs/Dockerfile
--- a/alpine/base/guestfs/Makefile
+++ b/alpine/base/guestfs/Makefile
--- a/alpine/base/mkimage-gce/Dockerfile
+++ b/alpine/base/mkimage-gce/Dockerfile
--- a/alpine/base/mkimage-gce/Makefile
+++ b/alpine/base/mkimage-gce/Makefile
--- a/alpine/base/mkimage-gce/make-gce
+++ b/alpine/base/mkimage-gce/make-gce
--- a/alpine/base/mkimage-gce/syslinux.cfg
+++ b/alpine/base/mkimage-gce/syslinux.cfg
--- a/alpine/base/mkimage-iso-bios/Dockerfile
+++ b/alpine/base/mkimage-iso-bios/Dockerfile
--- a/alpine/base/mkimage-iso-bios/Makefile
+++ b/alpine/base/mkimage-iso-bios/Makefile
--- a/alpine/base/mkimage-iso-bios/isolinux.cfg
+++ b/alpine/base/mkimage-iso-bios/isolinux.cfg
--- a/alpine/base/mkimage-iso-bios/make-iso
+++ b/alpine/base/mkimage-iso-bios/make-iso
--- a/alpine/base/mksh/Dockerfile
+++ b/alpine/base/mksh/Dockerfile
--- a/alpine/base/mksh/Makefile
+++ b/alpine/base/mksh/Makefile
--- a/alpine/base/pad4/Dockerfile
+++ b/alpine/base/pad4/Dockerfile
--- a/alpine/base/pad4/Makefile
+++ b/alpine/base/pad4/Makefile
--- a/alpine/base/pad4/pad4.sh
+++ b/alpine/base/pad4/pad4.sh
--- a/alpine/base/perf/.gitignore
+++ b/alpine/base/perf/.gitignore
--- a/alpine/base/perf/Dockerfile
+++ b/alpine/base/perf/Dockerfile
--- a/alpine/base/perf/Makefile
+++ b/alpine/base/perf/Makefile
--- a/alpine/base/perf/README.md
+++ b/alpine/base/perf/README.md
--- a/alpine/base/pinata-iptables/Dockerfile
+++ b/alpine/base/pinata-iptables/Dockerfile
--- a/alpine/base/pinata-iptables/Makefile
+++ b/alpine/base/pinata-iptables/Makefile
--- a/alpine/base/pinata-iptables/main.ml
+++ b/alpine/base/pinata-iptables/main.ml
--- a/alpine/base/qemu-user-static/Dockerfile
+++ b/alpine/base/qemu-user-static/Dockerfile
--- a/alpine/base/qemu-user-static/Makefile
+++ b/alpine/base/qemu-user-static/Makefile
--- a/alpine/base/riddler/Dockerfile
+++ b/alpine/base/riddler/Dockerfile
--- a/alpine/base/riddler/Makefile
+++ b/alpine/base/riddler/Makefile
--- a/alpine/base/riddler/riddler.sh
+++ b/alpine/base/riddler/riddler.sh
--- a/alpine/base/rng-tools/Dockerfile
+++ b/alpine/base/rng-tools/Dockerfile
--- a/alpine/base/rng-tools/Makefile
+++ b/alpine/base/rng-tools/Makefile
--- a/alpine/base/rng-tools/fix-textrels-on-PIC-x86.patch
+++ b/alpine/base/rng-tools/fix-textrels-on-PIC-x86.patch
--- a/alpine/base/rng-tools/sha256sums
+++ b/alpine/base/rng-tools/sha256sums
--- a/alpine/base/rngd/.gitignore
+++ b/alpine/base/rngd/.gitignore
--- a/alpine/base/rngd/Dockerfile
+++ b/alpine/base/rngd/Dockerfile
--- a/alpine/base/rngd/Makefile
+++ b/alpine/base/rngd/Makefile
--- a/alpine/base/runc/Dockerfile
+++ b/alpine/base/runc/Dockerfile
--- a/alpine/base/runc/Makefile
+++ b/alpine/base/runc/Makefile
--- a/alpine/base/tar2initrd/Dockerfile
+++ b/alpine/base/tar2initrd/Dockerfile
--- a/alpine/base/tar2initrd/Makefile
+++ b/alpine/base/tar2initrd/Makefile
--- a/alpine/base/tar2initrd/tar2initrd.sh
+++ b/alpine/base/tar2initrd/tar2initrd.sh
--- a/alpine/base/test/.gitignore
+++ b/alpine/base/test/.gitignore
--- a/alpine/base/test/Dockerfile
+++ b/alpine/base/test/Dockerfile
--- a/alpine/base/test/Makefile
+++ b/alpine/base/test/Makefile
--- a/alpine/base/test/bin/test.sh
+++ b/alpine/base/test/bin/test.sh
--- a/alpine/base/test/etc/moby
+++ b/alpine/base/test/etc/moby
--- a/alpine/base/tini/Dockerfile
+++ b/alpine/base/tini/Dockerfile
--- a/alpine/base/tini/Makefile
+++ b/alpine/base/tini/Makefile
--- a/alpine/base/toybox-media/Makefile
+++ b/alpine/base/toybox-media/Makefile
`@@ -1,4 +1,4 @@`
	`KERNEL_FILES=-C ../../kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar`	`KERNEL_FILES=-C ../kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar`

	`default: ebpf.tag`	`default: ebpf.tag`