Commit Graph

417 Commits

Author SHA1 Message Date
Sachi King
ea66def1fb Update RPi3 firmware to fix startup on newer kit
With the current firmware being pulled for the RPi3, recent revisions of
the RPi hardware, such as the 3 B+ will fail to boot.

The issue is exhibited as when RPi 3 B+ receives power and attempts to
boot, the power LED will turn off and the ACT LED will flash 8 times.
According to elinux.org troubleshooting guide[0] this correlates to an
SDRAM initialisation error that can be fixed by updating the firmware.

After updating this firmware the power light stays on, and UBoot can be
seen booting.

[0] - https://elinux.org/R-Pi_Troubleshooting#Green_LED_blinks_in_a_specific_pattern

Signed-off-by: Sachi King <nakato@nakato.io>
2019-04-23 10:30:31 +10:00
Sachi King
0bd28bd3a8 Vendor RPi firmware blob licenese
As per the license, the license must be provided with the binaries.

Signed-off-by: Sachi King <nakato@nakato.io>
2019-04-23 10:30:13 +10:00
Avi Deitcher
a02537ebe5 Build coreos grub off of alpine:3.9 and separate build steps for caching
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2019-04-18 11:50:05 +03:00
Rolf Neugebauer
94bfb97ba3 tools: Update to the latest linuxkit/alpine
Skip tools/grub as this still requires alpine 3.8
to build

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2019-04-16 22:53:26 +01:00
Avi Deitcher
d6b80396bb Move coreos-grub build to its own image
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2019-04-15 13:00:52 +03:00
Rolf Neugebauer
2b32dde645 alpine: Bump containerd to v1.2.6
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2019-04-14 11:29:08 +01:00
Ian Campbell
5e97fa4f69 alpine: Bump to containerd v1.2.5
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-03-13 07:15:23 -04:00
Daniel Dean
1653e9dffb Removed size arg from GCP make-fs command.
The make-gcp script in the mkimage-gcp tool creates a virtual fs of 1GB, excactly. If your filesystem needs to be larger, then make-gcp errors in a poorly explained way. Simply removing the arg makes the fs the same size as the image used to build it.

Signed-off-by: Daniel Smith <daniel@razorsecure.com>
2019-03-07 14:20:42 +00:00
Rolf Neugebauer
d341fdc666 tools/alpine: Update the package
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2019-03-03 06:16:57 -05:00
Rolf Neugebauer
f0815f755a tools/alpine: Add more wireguard packages
The wireguard package has some sub-packages which are
now dependencies. Include them in the alpine base.

Also include openresolv, which is required by one
of the wireguard packages.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2019-03-03 10:28:57 +00:00
Rolf Neugebauer
4f715f5f2a tools: Update to the latest linuxkit/alpine
Skip the packages which use grub to boot EFI images.

The grub build fails, see:
https://github.com/linuxkit/linuxkit/issues/3295

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2019-03-02 19:06:59 +00:00
Rolf Neugebauer
f6f13d6c4b tools/alpine: Update to latest
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2019-03-02 18:27:03 +00:00
Rolf Neugebauer
c217a7c7d1 tools/alpine: Move strace to x86 and arm64 only
It does not seem to be avail on s390x

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2019-03-02 17:57:02 +00:00
Rolf Neugebauer
ec5e383de4 tools/alpine: Update to Alpine Linux 3.9
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2019-03-02 10:39:31 +00:00
Ian Campbell
236d68f409 alpine: Bump to containerd v1.2.4
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-02-14 05:01:19 -05:00
Ian Campbell
baa56f8b22 alpine: Bump to containerd v1.2.3
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-02-11 04:47:22 -05:00
Ian Campbell
b4187fe6ea alpine: Bump to containerd v1.2.2
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-01-08 06:52:27 -05:00
Ian Campbell
c52e20a932 tools/alpine: Grab another file needed for wireguard APK build.
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-01-08 11:37:13 +00:00
Rolf Neugebauer
5b5f272890
Merge pull request #3205 from alicefr/fix_qemu_dockerfile
Missing s390x in the switch for qemu Dockerfile
2018-12-20 23:45:14 +00:00
Ian Campbell
544c8256ea alpine: Bump to containerd v1.2.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-10-30 06:53:32 -04:00
Ian Campbell
e78b25062c scripts: support credentials helpers on Linux
On Linux a key in `~/.docker/config.json` indicates if a credentials helper is
in use (and which), if one is then the method is identical to the Darwin case
so refactor to support that.

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-10-30 09:29:19 +00:00
Alice Frosi
8dd28e8e92 Add missing s390x in the switch for qemu Dockerfile
Signed-off-by: Alice Frosi <afrosi@de.ibm.com>
2018-10-17 17:41:58 +02:00
Ian Campbell
2ad451867e alpine: Bump to containerd v1.1.4
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-09-25 10:54:53 -04:00
Ian Campbell
f7c93dc4eb alpine: Bump to containerd v1.1.3
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-08-30 08:39:46 -04:00
Rolf Neugebauer
768593b951 tools: Update to the latest linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-26 19:22:42 +01:00
Rolf Neugebauer
ca53674154 tools/alpine: Update to latest
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-26 14:20:05 -04:00
Rolf Neugebauer
594ce1251d tools: Add a mkimage variant to build a non-bootable ISO.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-25 11:25:59 +01:00
Rolf Neugebauer
a9552aee2d tools: Fix mkimage-squashfs
Us a scratch image as the base instead of the alpine
base image.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
fe569b627a tools: Fix mkimage-raw-efi
Use a scratch image as the base instead of the full
alpine base.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
24d8ecc943 tools: Fix mkimage-raw-bios
Build the final image from scratch instead of the full
alpine base image.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
99e65ef998 tools: Fix mkimage-qcow2-efi
Build the final image from scratch instead of the full
alpine base.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
47bff24b94 tools: Fix mkimage-iso-efi
Build the final image from SCRATCH instead of the alpine base.
Should be a lot smaller now.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Rolf Neugebauer
4ca0458526 tools: Use a multi-stage build for mkimage-iso-bios
mkimage-iso-bios contained the full alpine base. Only
copy packages actually needed.

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
2018-07-24 22:30:53 +01:00
Ian Campbell
6b6596f881 alpine: Bump to containerd v1.1.2
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-07-16 05:29:27 -04:00
Rolf Neugebauer
3beb03c684 tools/alpine: Update linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-11 23:59:20 +00:00
Rolf Neugebauer
7d9457382c tools/alpine: Add packages needed for the iovisor/bcc tools
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-12 00:25:30 +01:00
Rolf Neugebauer
cd4d50920a tools: Update to latest alpine base
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-07-10 14:59:45 +01:00
Ian Campbell
8ad9f65ec8 alpine: Bump to containerd v1.1.1
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-07-10 04:52:57 -04:00
Rolf Neugebauer
48ca3f1302 tools: Update to latest alpine base
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-07 13:27:48 +01:00
Rolf Neugebauer
20e71cf09e tools/alpine: Update alpine base
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-07 08:21:54 -04:00
Rolf Neugebauer
1b23313bb3 tools/alpine: Remove gummiboot for arm64
The package does not exist any more in 3.8 and I can't
see any uses for it.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-07 11:43:06 +01:00
Rolf Neugebauer
53af0ce80c tools/alpine: Remove go1.10
alpine:3.8 comes with go 1.10 as default

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-07 09:30:51 +01:00
Rolf Neugebauer
3c492fe40a tools/alpine: Update to alpine:3.8
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-07-07 09:29:59 +01:00
Ian Campbell
779a611d6b alpine: Bump to containerd v1.1.0-rc.2
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-06-28 12:34:50 -04:00
Alan Raison
412857be96 Use apk --print-arch to discover architecture
When dealing with apk, `uname -m` doesn't always match the architecture
name that apk uses. Instead `apk --print-arch` is used.

Signed-off-by: Alan Raison <alanraison@users.noreply.github.com>
2018-06-26 23:16:20 +01:00
Ian Campbell
a5ed0cf40a alpine: Bump to containerd v1.1.1-rc.1
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-06-19 11:00:45 -04:00
Rolf Neugebauer
910d453769 tools/alpine: Add sntpc to alpine base
sntpc is a very simple ntpc client, which may be useful
for some setups.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-06-05 08:10:18 -04:00
Ian Campbell
55d66b434f alpine: Bump to containerd v1.1.1-rc.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-06-01 08:49:28 -04:00
Rolf Neugebauer
d9c3e3fce2 tools: Update to latest alpine base
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-05-12 12:10:32 +01:00
Rolf Neugebauer
46b90f0dae tools/alpine: Update to latest
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@gmail.com>
2018-05-12 06:58:57 -04:00
Ian Campbell
56a93fb81a alpine: Bump to containerd v1.1.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-04-25 04:58:17 -04:00
Ian Campbell
b58248edaf
Merge pull request #3007 from ijc/containerd-v1.1.0-rc.2
containerd v1.1.0-rc.2
2018-04-18 15:29:48 +01:00
Ian Campbell
6a4d0df63c alpine: Bump to containerd v1.1.0-rc.2
Requires libseccomp-dev and the go1.10 package

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-04-18 06:25:55 -04:00
Justin Cormack
17fbdbb920
Add keyutils to packages
I am doing some upstream `runc` work with kernel keys and have
various other uses. No urgency so not updating the package
builds yet.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-04-18 09:56:25 +01:00
Rolf Neugebauer
c0377bf343 tools: Add mkimage-squashfs
This utility image takes a tarball as input and places the
contents into a read-only, compressed squashfs filesystem
which is produced on stdout.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-04-16 18:39:31 +01:00
Rolf Neugebauer
39b9ac9b7f tools: Update tools to the latest alpine base image
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-04-05 10:49:00 +01:00
Ian
2d6b147854 Add rebuild info for tools/alpine for s390x
Missed previously.

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-04-03 13:20:15 +01:00
Ian Campbell
7a48d9358c alpine: Bump to containerd v1.0.3
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-04-03 10:11:31 +00:00
Rolf Neugebauer
a8d3ef2ca1 tools: Clarify the supported architectures
Most of the tools packages are not usable on s390x so
explicitly list them.

Also removed arm64 from mkimage-gcp as GCP does not
support arm machines and fixed a  minor inconsistency
the way the architecture was specified in mkimage-raw-bios.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-03-13 16:27:30 +00:00
Rolf Neugebauer
61727d3b50 tools: Update to the latest alpine base image
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-03-13 14:39:57 +00:00
Rolf Neugebauer
6ac582b6d3 tools/alpine: Update to latest
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-03-13 11:56:29 +00:00
Rolf Neugebauer
afbd3a93d9 tools/alpine: Update alpine base to latest
Also add s390x images

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-02-28 16:35:23 +00:00
Rolf Neugebauer
03c3fd65c3 tools/alpine: Fix push-manifest.sh
- On macOS, docker-credential-osxkeychain.bin was renamed to
  docker-credential-osxkeychain
- Pass --ignore-missing to the manifest-tool invocation.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-02-28 16:35:23 +00:00
Rolf Neugebauer
2a984165fb tools/alpine: Add a dummy versions.s390x file
This is temporary to un-break the build until we have pushed
a alpine base image for s390x.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-02-28 14:59:59 +00:00
Rolf Neugebauer
e0e490d4c6 tools/alpine: Build our own wireguard-tools package
Currently, there is a conflict in musl versions between stable
(used for tools/alpine) and edge (where wireguard-tools is).
This cased the tools/alpine build to fail.

With this commit we build our own wireguard-tools package,
using the  APKBUILD file from edge, against the libraries
libraries from stable. We then add the wireguard-tools package
to the mirror.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-02-28 14:39:47 +00:00
Avi Deitcher
58f2644354
Merge pull request #2935 from garthy/qcow-efi-support
Adds support for building a qcow2 EFI image
2018-02-27 19:21:20 +00:00
Garth Bushell
73b608f8e6 Adds support for building a qcow2 EFI image
Signed-off-by: Garth Bushell <garth.bushell@oracle.com>
2018-02-27 16:58:42 +00:00
Alice Frosi
4591410607 Add s390x support for linuxkit docker images
Add support for s390 architecture for linuxkit/alpine and the
other docker images in tools and pkg.

Signed-off-by: Alice Frosi <alice@linux.vnet.ibm.com>
2018-02-27 15:16:58 +00:00
Ian Campbell
046d74775e alpine: Bump to containerd v1.0.2
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-02-14 12:11:21 +00:00
Ian Campbell
39722f0982 alpine: Bump to containerd v1.0.2-rc.1
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-02-07 09:49:23 +00:00
Ian Campbell
2e5f24a2c0 alpine: Bump to containerd v1.0.2-rc.0
https://github.com/containerd/containerd/releases/tag/v1.0.2-rc.0

$ git log --oneline --no-merges v1.0.1..v1.0.2-rc.0
a67e9d27 release: prepare 1.0.2-rc.0
91c3b8bf content/testsuite: pass context to hold lease
c910b470 content/testsuite: ensure unique content per test
45e7aa52 Update copy to discard over truncate
d7a0e702 Add resume content test cases
5c21576e Fix duplicate directories entries on metadata change
af4455b3 vendor: update go-runc to reduce gc pressure
f042dc58 cmd/containerd-shim: aggressive memory reclamation
8cf32d34 cmd/containerd-shim, reaper: reduce channel allocation
367eddb4 archive, cio, cmd, linux: use buffer pools
852f989a Update runc to 9f9c96235cc97674e935002fc3d78361b69
a03fb1bd Fix NPE in dialer
d04746b4 Update metadata image store to be initialized once
5a67161d Update namespace empty check to use buckets

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-01-31 09:40:52 +00:00
Rolf Neugebauer
c582907b19 tools: Fix guestfs invocation (vmdk and dynamic-vhd)
Looks like bc791e60e7 ("Update docs and test cases to work with
latest format versions") accidentally replaced 'qcow2' with
'qcow2-bios' for two of the output formats. Fix it.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-01-25 19:40:27 +00:00
Rolf Neugebauer
a2b3b4fb73 tools: Update linuxkit/guestfs
This part reverts f7c50156c5 ("tools: pull linuxkit/guestfs by digest
only (not digest+tag)") as pulling by tag now seems to work and we
have content trust enabled, so pulling by digest should not be necessary.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-01-25 13:07:23 +00:00
Rolf Neugebauer
965d013f7f tools: Update to the latest linuxkit/alpine
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-01-25 12:59:21 +00:00
Rolf Neugebauer
42604a12f0 tools/alpine: Update base image
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-01-24 11:42:58 +00:00
Rolf Neugebauer
0fe22581f3 tools/alpine: Add pigz to pacakges
Moby is moving to using pigz instead of the the golang gzip
library (https://github.com/moby/moby/pull/35697)

Include pigz in the base for downstream projects to use.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-01-24 10:50:06 +00:00
Ian Campbell
594e098c4c alpine: Bump to containerd v1.0.1
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-01-18 10:58:28 +00:00
Rolf Neugebauer
e68cc70352 tools/alpine: Update alpine base
This also adds the iucode_tool utility for x86_64

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-01-14 13:04:57 +00:00
Rolf Neugebauer
31cb9539b8 tools/alpine: Add iucode_tool to base
The iucode_tool is used to convert the Intel CPU microcode
binaries into a cpio archive. There is no alpine package
for it, so compile it from source.

This is for x86_64 only and on other archs we create a empty
file.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2018-01-14 12:42:57 +00:00
Ian Campbell
e862410a07 alpine: Bump to containerd v1.0.1-rc.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2018-01-12 10:50:17 +00:00
Ian Campbell
d01f4e97d7 Add audit package to mirror.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-15 11:00:19 +00:00
Rolf Neugebauer
5fd1fa3663 tools: Update to the alpine:3.7 derived base image
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-08 16:25:13 +00:00
Rolf Neugebauer
f657ac9095 tools/alpine: Switch to alpine:3.7
alpine:3.7 also comes with go-1.9 so the special case
is not longer needed.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-12-08 16:25:13 +00:00
Ian Campbell
206bb92bbe alpine: Bump to containerd v1.0.0
https://github.com/containerd/containerd/releases/tag/v1.0.0

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-05 09:54:47 +00:00
Ian Campbell
e5caf00020 alpine: bump to containerd v1.0.0-rc.0
https://github.com/containerd/containerd/releases/tag/v1.0.0-rc.0

Minor build tweaks needed.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-12-01 13:21:08 +00:00
Rolf Neugebauer
eb9a5604a8 tools/alpine: Add mpc1-dev/mpfr-dev
These are needed to enable GCC_PLUGINS for the Linux kernel build.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-21 14:02:33 +00:00
Dennis Chen
258e4c37d2 alpine: Remove the 'content trust build' workaround
Before the alpine base image is multi-arch and signed, the
DOCKER_CONTENT_TRUST=1 doesn't work on AArch64 for 'docker build'.
Now since the alpine base image is already multi-arch and signed,
also we've used 'push_manifest.sh' to push and sign linuxkit/image,
so we can remove this workaround.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-11-17 10:37:40 +00:00
Dennis Chen
807c60c0c6 tools: Remove the CoreOS grub2 patche
Remove the grub2 patch from LinuxKit since it has already been merged
into the CoreOS grub2 mainline code.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-11-10 06:25:40 +00:00
Ian Campbell
73cf544d33 alpine: bump to containerd containerd-v1.0.0-beta.3
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-11-09 10:16:33 +00:00
Rolf Neugebauer
f14f418e5e tools/alpine: Update to get new version of WireGuard tools
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-11-03 15:11:06 +00:00
Rolf Neugebauer
afc59610f6
Merge pull request #2658 from deitch/format-docs
Update docs and test cases to work with latest format versions
2017-10-31 13:46:17 +00:00
Avi Deitcher
bc791e60e7 Update docs and test cases to work with latest format versions
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-10-31 13:49:52 +02:00
Avi Deitcher
097757580d Fix KB calculation for raw images
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-10-31 10:27:04 +02:00
Rolf Neugebauer
181096f935 tools: Use alpine multi-arch image for linuxkit/alpine
https://github.com/docker-library/official-images/pull/3623
introduced alpine multi-arch images. Use it instead of
separate base images.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-10-29 12:32:40 +00:00
Ian Campbell
6c7b1c0251 Bump all packages to newest alpine.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-24 10:11:24 +01:00
Ian Campbell
12e4347bf7 alpine: rebuild
Picks up CVE-2017-15650 fix and some other updates.

Adds ipvsadm and bridge-utils (fixes: #2606).

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-24 09:10:22 +00:00
Rolf Neugebauer
c15f320ff6 tools: Add mkimage-rpi3 to build images for raspberry Pi 3
The package contains u-boot and the RPi firmware blobs. It expects
a tar ball of the root filesystem (including kernel and dtbs) on stdin
and produces a compressed tar ball on stdout with the files to copy to
a FAT32 formatted SD card.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-10-19 09:20:21 +02:00
Rolf Neugebauer
deb1b2980b tools: Add dtc to alpine base
The device tree compiler is needed for some of the ongoing
arm64 work

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-10-13 14:18:33 +00:00
Ian Campbell
a87a07c8e9 tools: enable content trust for mkimage-*
A few of these already had content-trust, enable for the remaineder.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-13 10:21:17 +01:00
Ian Campbell
02bd90393f go-compile: Bump to new alpine (with go1.9)
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-12 16:36:18 +01:00
Ian Campbell
6ee21a37c6 alpine: Pull in go (1.9) from Edge
This is a requirement of containerd.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-12 15:32:15 +00:00
Ian Campbell
1d030172bf Merge pull request #2600 from ijc/containerd-v1.0.0-beta.2
Bump to containerd v1.0.0-beta.2
2017-10-12 16:19:01 +01:00
Ian Campbell
19a02ef28c alpine: bump to containerd v1.0.0-beta.2
Note that a237b51511 ("Bump alpine base across the board.") inadvertently
corrupted `tools/alpine/versions.aarch64` (by updating it to the amd64 hash),
this commit corrects this as part of the rebuild.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-12 12:51:20 +01:00
Justin Cormack
995bde5a54 Merge pull request #2558 from deitch/raw-bios
Add support to make minimal raw bios images
2017-10-12 11:24:14 +01:00
Justin Cormack
3b07a9e793 Merge pull request #2540 from deitch/raw-efi
Add support to make raw efi images
2017-10-12 11:23:32 +01:00
Avi Deitcher
8f3e4e419d Add support to make raw efi images; simplify raw bios build
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-10-10 21:00:53 +03:00
Avi Deitcher
fb5383a25e simplify raw bios build
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-10-10 20:59:48 +03:00
Ian Campbell
d055ab31d8 tools: mkimage-*: disable content trust
Signing is not setup for these repositories. It seems they haven't been updated
since before trust was added since their previous Makefile metadata (which was
translated in build.yml) did not contain `NOTRUST=1`.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-10 10:13:15 +01:00
Ian Campbell
a237b51511 Bump alpine base across the board.
By running:

    ./scripts/update-component-sha.sh --image linuxkit/alpine ad35b6ddbc70faa07e59a9d7dee7707c08122e8d

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-10 09:55:45 +01:00
Ian Campbell
206fc78a6a Update alpine package
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-10 08:54:44 +00:00
Ian Campbell
13d11f49ba Rename "tag*" Makefile targets to "build*"
This better matches the `linuxkit pkg build` nomenclature.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-09 16:48:48 +01:00
Ian Campbell
624e7c82f1 Convert most of tools/* to linuxkit pkg build
tools/alpine and tools/guestfs are omitted since they do not currently use
pkg/package.mk and do their own thing. Slightly hacky arrangements are made for
these. Note that previously they were only recursed into for their default
target (push) and that behaviour is retained.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-09 16:20:25 +01:00
Ian Campbell
f7c50156c5 tools: pull linuxkit/guestfs by digest only (not digest+tag)
Current versions of Docker complain:

    Sending build context to Docker daemon   5.12kB
    Step 1/4 : FROM linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f
    ...
    Successfully tagged linuxkit/mkimage-gcp:736880776838c8f41c081276d9c017ae6adbf1bb-amd64
    Tagging linuxkit/guestfs@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f as linuxkit/guestfs:aecc40bf84ce4f4238e06934c46d7cc570a39eed@sha256:62e810869e83dabe04af7ac8fcd81d9f177d986a3424dcb9c4eb5439993c962f
    refusing to create a tag with a digest reference
    ../../pkg/package.mk:82: recipe for target 'tag-y' failed

Just use the digest for now. Perhaps someone will have time to fixup this build
properly at some point.

Make the same change to test/pkg/ltp.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-09 16:20:10 +01:00
Ian Campbell
ca70b7b6af Update pkg/Makefile and test/pkg/Makefile based on tools/Makefile
Using explicit targets is cleaner and easier to follow.

Also add `forcepush` to pkg and test/pkg and make `push` explicit.

The `dirs` phony was non-existent in all three cases. Likewise `$(DIR)` wasn't
used in that way in pkg or test/pkg and is nolonger used in that way in tools.

Finally, `clean` was bogus in all cases (tools cleaned a thing which never
exists and pkg and test/pkg were a syntax error).

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-10-09 16:20:08 +01:00
Rolf Neugebauer
cac4168e26 tools/alpine: Add nfs-utils
New package is at: linuxkit/alpine:3fb44354a34b05134fbf585a00217cd2f8c8f0bf

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-10-06 13:32:45 +00:00
Rolf Neugebauer
61a1b9774c tools/alpine: Explicitly add blkid
On x86_64, the blkid package gets installed as a dependency, but
not on arm64. Explicitly add it as the new format package depends
on it.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-10-02 17:35:26 +00:00
Rolf Neugebauer
eafdbbd0fe tools/alpine: Add cifs-utils
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-10-02 13:22:30 +00:00
Rolf Neugebauer
21e26dcb46 tools/alpine: Add wireless-tools and wpa_supplicant
available as: linuxkit/alpine:a94acee63dc1d0bd5cd5006d66514f62373650f2

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-27 10:20:34 +00:00
Ian Campbell
fb94b23a93 alpine: rebuild
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-25 12:29:10 +00:00
Ian Campbell
7bd1ca47b0 alpine: Add packages which are build dependencies of Kubernetes
Currently projects/kubernetes pulls in the binaries, adding these dependencies
will allow us to build them as part of our packaging process.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-25 12:17:02 +01:00
Ian Campbell
9ddcdaba56 alpine: bump to containerd v1.0.0-beta.1
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-25 12:16:23 +01:00
Justin Cormack
c8f5d16a25 Merge pull request #2524 from arm64b/mkimage-efi-iso
mkimage: Support iso-efi generation for both arm64 and amd64
2017-09-24 09:03:53 -07:00
Dennis Chen
fa1829529d tools: Support iso-efi generation for both arm64 and amd64
This patch uses coreos grub2 instead of the built-in gummiboot
tool with Alpine distribution.

Coreos grub2 has the security feature such as TPM and kernel
verification, so we can setup a trust chain when loading
modules with grub2.

GNU grub2[1] also has the plan to add those security related
features, they have a 'verifiers' branch to do that, but
there're some build issue need to fix,so this patch use
coreos as an alternative.

This patch is used to address the #2359 #2375.

Thanks Avi Deitcher <avi@deitcher.net> for the contribution
to build the GRUB2 from ubuntu 16.04 to alpine base image.

Change Log:

1.Address the comments raised by @rn
2.Change the '/dev/vda' as the device name point by kernel command
  line 'root=' on arm64, '/dev/sr0' on amd64. As next plan, we can adapt
  a more flexible method to get the dev name of the CDROM.
3.Switch the base image to build grub2 from ubuntu 16.04 to alpine.
4.'linux' as the grub2 menu entry on arm64, while 'linuxefi' on amd64.

[1] https://git.savannah.gnu.org/git/grub.git

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-09-24 14:06:19 +00:00
Justin Cormack
a48a6b3e97 Build containerd in Alpine image
This makes it easier to add the containerd testing tools like
`containerd-stress` to test packages, for example, and also at
some point move `ctr` out of the base image as it can be installed
from the alpine image.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-09-20 21:16:54 +00:00
Ian Campbell
dea2e1df66 alpine: add coreutils
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-20 14:22:55 +00:00
Rolf Neugebauer
b971db8a4b tools/alpine: Update alpine base image
In particular this updates the wireguard tools to a newer version.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-20 10:43:55 +00:00
Ian Campbell
b736afeee3 alpine: bump to containerd v1.0.0-beta.0
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-07 17:28:38 +00:00
Rolf Neugebauer
1d33b90530 tools/alpine: Add iSCSI and related tools to base
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-09-04 17:58:16 +01:00
Rolf Neugebauer
db6e8bae35 tools: Add openssl, attr-dev, and libtirpc-dev to the alpine base image
The first is needed by the okernel project and last two to run
configure on the zfs kernel modules.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-31 15:54:12 +00:00
Ian Campbell
6d878dd65f alpine: bump to containerd v1.0.0-alpha6
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-29 00:39:20 +01:00
Justin Cormack
90f905a799 Move containerd clone to tools/alpine
As discussed before, as we use this in three places, cloning in
base makes more sense.

Update base image.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-21 15:16:09 +01:00
Justin Cormack
92d31d733d Add ebtables, socat, libc6-compat to alpine base
These are needed by Kubernetes which is currently not using the standard abse image.

Also sort it.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-21 13:34:02 +01:00
Rolf Neugebauer
944b6a5816 tools/alpine: Add ethtool
resolves #2419

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-16 00:58:42 +01:00
Rolf Neugebauer
795ca7d0e4 tools/alpine: Update base image
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-15 11:11:30 +01:00
Avi Deitcher
40aee08ddb Add sgdisk package to linuxkit/alpine
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-08-14 18:30:30 +02:00
Ian Campbell
da6cbf74f3 alpine: Update to containerd v1.0.0-alpha4 base.
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-11 16:13:23 +01:00
Justin Cormack
3321e713de Merge pull request #2363 from justincormack/efi-tar
Put full filesystem on EFI ISO
2017-08-07 19:10:39 +01:00
Ian Campbell
bfd9499795 alpine: bump to containerd v1.0.0-alpha3
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-08-07 11:39:09 +01:00
Justin Cormack
fdc4eb7c32 Put full filesystem on EFI ISO
In line with BIOS ISO changes previously.

Remove boot options, user can add if required, they made boot very slow.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-04 21:04:37 +01:00
Rolf Neugebauer
473d544996 tools: Update remaining tools to the multi-arch base
linuxkit/mkimage-iso-bios did not work
on aarch64 (no syslinux) and will error.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Rolf Neugebauer
6adde26d62 tools/go-compile: Convert to multi-arch
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Rolf Neugebauer
6d4162343a scripts: Add a script to push and sign manifests
Also adjust the 'linuxkit/alpine' script to follow the
same pattern.

The new version of the script extract username/password from
the credential helper (or docker) and build and 'expect'
script to feed the info to 'notary'.

They can be invoked by:
DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE="phrase" ./push-manifest.sh ...

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:21 +01:00
Justin Cormack
570d706486 Merge pull request #2339 from justincormack/iso-files
Unpack filesystem for BIOS ISO
2017-08-02 15:47:59 +01:00
Justin Cormack
2b045f59fe Unpack filesystem for BIOS ISO
Now that LinuxKit works on a truly immutable filesystem, for an
ISO it makes sense to use the ISO filesystem rather than using
an initrd. Only major difference is you may need to specify the
device for the root filesystem in the kernel command line, but
we set a sane default of `/dev/sr0` if unspecified.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-02 13:28:35 +01:00
Rolf Neugebauer
fb6079b1a4 tools/alpine: Convert the alpine base image to a multi-arch image
- append a architecture specific suffix (-amd64, -arm64) to the
  image
- add a script which looks up the hashes from the 'versions' file
  and creates a multi-arch manifest
- the manifest is pushed to hub and signed with notary

The new linuxkit/alpine multi-arch image is available with the
x86_64 hash without the '-amd64' suffix.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-01 16:46:41 +01:00
Justin Cormack
17f5da9fea Provide way for programs to use CGO with go-compile script if they need to
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 16:11:07 +01:00
Ian Campbell
886870c935 alpine: Use C locale to sort the versions file.
This should reduce instability due to different people's environment. This
undoes the reordering done by "alpine: Update to containerd v1.0.0-alpha2",
leaving just the hash update (as expected).

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 12:14:36 +01:00
Ian Campbell
c8164c0a6e alpine: Update to containerd v1.0.0-alpha2
Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:07:03 +01:00
Justin Cormack
bafeac62ec Merge pull request #2301 from rn/base-ovmf
Various OVMF related fixes
2017-07-27 10:25:24 +01:00
Rolf Neugebauer
930c9c21df tools/qemu: Install ovmf for x86
The previous commit moved ovmf to the packages instead
of stashing it on the filesystem. This requires the
package to be installed here.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-26 18:14:28 +01:00