Commit Graph

58 Commits

Author SHA1 Message Date
Rolf Neugebauer
209f317fd1 projects: Move non-working ebpf bits under projects
The ebpf packages were somewhat neglected during the restructuring of the
the repository and currently do not build. They were also a little awkward
to use. So move them to ./projects for now until it matures.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-29 17:36:25 +01:00
Rolf Neugebauer
ce90e6290c Merge pull request #1411 from rneugeba/cleanup
more repository cleanup
2017-03-29 16:52:32 +01:00
Rolf Neugebauer
534fd2940f base: Remove mksh
It does not seem to be used by anything here anymore.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-29 16:38:57 +01:00
Rolf Neugebauer
a319b1b1ef base: Move guestfs to tools.
Guestfs is not really a base package and is only used
byt other images in the ./tools directory. Move it there.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-29 16:37:59 +01:00
Rolf Neugebauer
ee536158a2 projects: Move AWS bits to projects until they are usable again
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-03-29 16:28:21 +01:00
Justin Cormack
8847edb288 Remove syslinux from kernel build deps
Unused. This should not affect anything, and I didnt actually bump
the kernel version; am working on te build in CI for this...

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-27 12:17:09 +01:00
Justin Cormack
d2caae4c1a Update containerd to current master
- now supports image pull and run end to end
- update runc to last version before spec update fix #1302
- remove ext2 utils from init

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-25 18:15:52 +00:00
Justin Cormack
1fb69b9bbf Move installable packages to pkg
Still leaves some intermediate repos in `base/`

See #1266

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-22 12:33:11 +00:00
Justin Cormack
cb47179e7e Make sshd output to stderr not syslog
This way we get to see the logs.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-22 09:43:32 +00:00
Justin Cormack
c373877094 Remove unused alpine-base image
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-20 16:15:41 +00:00
Justin Cormack
2cb4d1d096 Merge pull request #1323 from justincormack/gcp-metadata
Add a metadata handler for GCP which allows ssh login
2017-03-16 19:24:43 +00:00
Justin Cormack
43bbb06a81 Clean up apk cache in init
See #1312

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-16 19:14:08 +00:00
Justin Cormack
a66a537164 Add a metadata handler for GCP which allows ssh login
- this needs improvements to make it more "platform native", in
  particular GCP supports multiple users and more ssh key mangement
  options.
- at present you can login as root with any platform ssh key
- add support for uts=host and ipc=host
- set the hostname from the metadata as well

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-16 18:45:44 +00:00
Riyaz Faizullabhoy
f72a5693b5 logs: separate daemon container logs into separate files
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-15 12:24:10 +00:00
Justin Cormack
14a03ec5a2 Merge pull request #1291 from riyazdf/cleanup-tests
Remove unused test bits
2017-03-13 14:15:30 +00:00
Riyaz Faizullabhoy
eeae1d9630 Remove unused test bits
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-03-13 12:06:24 +00:00
Justin Cormack
8517b975d5 Fix build of Docker container
- rename it `docker-ce` to make it clearer.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-13 11:32:37 +00:00
Justin Cormack
4f9974e243 Merge pull request #1281 from justincormack/sysctl-extras
Add default Alpine sysctl settings back
2017-03-10 17:28:03 +00:00
Justin Cormack
3823d50654 Add default Alpine sysctl settings back
- these were set via the Alpine config file previously.
- removed `kernel.panic` as we have decided to avoid reboot on panic.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 17:15:40 +00:00
Justin Cormack
54483effea Fix cut and paste typo in startup code
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 17:13:16 +00:00
Justin Cormack
857599a609 Merge pull request #1278 from justincormack/containerd-up
Update containerd
2017-03-10 16:51:52 +00:00
Justin Cormack
9ebc11034a Merge pull request #1277 from justincormack/vhd
Add VHD and GCE output formats
2017-03-10 16:13:23 +00:00
Justin Cormack
41fac88bf6 Add VHD and GCE output formats
- VHD is uncompressed VHD. Currently hard coded at 1GB, which may need to change. Use `format: vhd`
- GCE is the GCE compressed tarred raw image. Use `format: gce-img` - reserving `gce` for actually
  uploading the image.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 16:10:48 +00:00
Justin Cormack
a2fe3ce391 Update containerd
- in a much better state than previous commit, but still some issues
running system containers with it that need more work, so staying with `runc`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-10 16:07:44 +00:00
Thomas Gazagnaire
166f2b2ccf Update runc
Update to opencontainers/runc@49a33c41f8

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-03-10 14:19:41 +01:00
Justin Cormack
4170897db0 Strip Go files to make them a bit smaller
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 15:30:15 +00:00
Justin Cormack
681ed3f37d Add in sysctl container
- based on @riyazdf earlier unmerged Go version 891c006d34/alpine/containers/cloud-config/main.go

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 14:41:19 +00:00
Justin Cormack
eefa303497 Do not wait for containerd to be ready, as not using it yet
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-09 14:37:28 +00:00
Justin Cormack
933c826d74 Add Docker container
- need to format filesystem before testing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 21:37:07 +00:00
Justin Cormack
fc6c5e5c66 More cleanup
- remove more editions code
- remove unused tool pad4
- add back whale to test output

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-07 13:05:53 +00:00
Justin Cormack
cd08084738 Out with the old, in with the new Moby
- remove remainder of editions code
- add a new check container to run tests without Docker
- switch over `make test` to use new command to build tests

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-06 22:28:41 +00:00
Justin Cormack
2ab099f349 Add output types for BIOS and EFI ISOs
Note that the EFI ISO is not yet automatically sized, and the
kernel command lines are currently hard coded in the builders.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-03 18:44:47 -08:00
Justin Cormack
33471d4070 Better shutdown script
- make sure we unmount filesystems

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-03-01 17:01:38 -08:00
Justin Cormack
194798cbf5 If no hostname is set, use mac address to generate one.
Currently not working very well in hyperkit due to https://github.com/docker/vpnkit/issues/190

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-28 17:42:40 -08:00
Riyaz Faizullabhoy
3053ac1725 Merge pull request #1202 from justincormack/go-up
Update to Go 1.8
2017-02-17 09:19:53 -08:00
Riyaz Faizullabhoy
5ed7744538 Merge pull request #1197 from justincormack/testup
Update kernel config tests
2017-02-17 09:19:44 -08:00
Justin Cormack
d7e6d42963 Update to Go 1.8
This includes most things except the containerd and runc builds
which I will do next time I update them.

Note that all golang:alpine images now for 1.8 are ALpine 3.5 based.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 16:31:19 +00:00
Justin Cormack
46628d7d41 Merge pull request #1201 from justincormack/newtools
Add new minimal init prototype and new tools
2017-02-17 15:56:42 +00:00
Justin Cormack
1dfa95d660 Add new minimal init prototype and new tools
This is part of the new moby tool work to get a minimal system
up that can be expanded.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 15:31:00 +00:00
Justin Cormack
802c56bcd3 Update kernel config tests
- `CONFIG_BUG_ON_DATA_CORRUPTION` is a 4.10 kernel only flag, so gate this.
- some config was duplicated on gated and normal config
- some 4.4 issues with the new config

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-17 14:52:32 +00:00
Riyaz Faizullabhoy
5a5c58c29f Bump kernel config test and revert IA32_EMULATION
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-13 11:38:14 -08:00
Riyaz Faizullabhoy
7036d3d676 Add page_poison=1 to boot args
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-13 10:16:46 -08:00
Justin Cormack
5112209050 alpine-build-c is only used for kernel builds so rename
Also remove some unecessary packages.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-13 16:59:38 +00:00
Justin Cormack
4fa7e902c4 Restore containerd and runc containers
These were removed in #1145

Need these for a new build; keeping the current build in the
`alpine/` directory unchanged for editions for now so the issues
here do not affect them.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-02-06 16:08:11 +00:00
Riyaz Faizullabhoy
0003deabea Revert to non-development containerd and runc until nats port is sorted out
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-02-02 11:57:28 -08:00
Riyaz Faizullabhoy
0c545c0c53 Split base/ into base/ and tools/
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-31 09:52:30 -08:00
Riyaz Faizullabhoy
2979ff0303 reformat tags before digests
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-31 09:33:06 -08:00
Justin Cormack
542820c4f5 Merge pull request #1120 from justincormack/checkconfigup
Update check-config script
2017-01-31 10:55:47 +00:00
Justin Cormack
3325e130fe Update check-config script
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-31 10:31:26 +00:00
Justin Cormack
43f781eff1 Clean up GCE image build
In line with the others, support any file names on input.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-30 22:04:34 +00:00