Commit Graph

262 Commits

Author SHA1 Message Date
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