Commit Graph

2033 Commits

Author SHA1 Message Date
Riyaz Faizullabhoy
2cdefa184e Use apk audit to check system binaries
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-31 11:33:11 -08:00
Justin Cormack
0ede7d930b Merge pull request #1098 from riyazdf/tools-dir
Split base/ into base/ and tools/
2017-01-31 18:07:35 +00:00
Riyaz Faizullabhoy
d66bc2d501 Split base/ into base/ and tools/
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-31 09:52:30 -08:00
Justin Cormack
a6416a1214 Merge pull request #1121 from justincormack/fsck-y
Try to fsck harder
2017-01-31 17:50:16 +00:00
Justin Cormack
9fdbcf3e2e Merge pull request #1122 from riyazdf/tag-fmt
Reformat tags before digests
2017-01-31 17:49:26 +00:00
Riyaz Faizullabhoy
56899b318d reformat tags before digests
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-31 09:33:06 -08:00
Justin Cormack
64bcf1adce Try to fsck harder
This will potentially leave stuff in lost+found but may be able to
recover from more filesystem corruption.

See #736

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-31 12:42:37 +00:00
Justin Cormack
76c20080d9 Merge pull request #1120 from justincormack/checkconfigup
Update check-config script
2017-01-31 10:55:47 +00:00
Justin Cormack
db101a1e06 Update check-config script
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-31 10:31:26 +00:00
Justin Cormack
101777fdc0 Merge pull request #1118 from justincormack/gce-cleanup
Clean up GCE image build
2017-01-31 09:20:06 +00:00
Justin Cormack
699560aaad 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
Justin Cormack
38b6847669 Merge pull request #1116 from justincormack/iso-cleanup
Cleanup BIOS ISO builds
2017-01-30 20:32:23 +00:00
Riyaz Faizullabhoy
c3b393625e Merge pull request #1114 from justincormack/goupflag
Update Go to 1.7.5 and remove unnecessary linker flag
2017-01-30 09:21:26 -08:00
Justin Cormack
0fca0245c4 Cleanup BIOS ISO builds
- do not require specific filenames for input
- change EFI build to use `docker run`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-30 15:18:06 +00:00
Justin Cormack
ddb41952ef Update Go to 1.7.5 and remove unnecessary linker flag
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-30 14:10:41 +00:00
Justin Cormack
2cec1fe16b Merge pull request #1094 from justincormack/sshd-new
Add an sshd container
2017-01-30 11:06:39 +00:00
Justin Cormack
483ea5cb81 Merge pull request #1112 from justincormack/patchfilesfix
Clean up patch copying
2017-01-29 21:34:38 +00:00
Justin Cormack
c624fee01c Merge pull request #1111 from justincormack/kernel-move
Split kernel files into their own image
2017-01-29 21:34:18 +00:00
Justin Cormack
dfa8321eba Split kernel files into their own image
This means the base system build and kernel build can be split
without dependencies, and just assembled later.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-29 21:07:20 +00:00
Justin Cormack
8ff1fe144d Clean up patch copying
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-29 20:26:51 +00:00
Justin Cormack
aa6fce33fd Merge pull request #1110 from justincormack/umount-db
Unmount database after copying
2017-01-28 17:30:25 +00:00
Justin Cormack
af88a66bc7 Unmount database after copying
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-28 17:09:01 +00:00
Justin Cormack
6ed82e06d0 Merge pull request #1109 from justincormack/mac-mount-fix
Fix mountpoint for mac
2017-01-28 15:07:33 +00:00
Justin Cormack
9e18a0ae4c Fix mountpoint for mac
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-28 14:45:44 +00:00
Justin Cormack
1674534757 Merge pull request #1108 from justincormack/osx-mountpoint
Mount osx 9p db on /mnt
2017-01-28 12:27:20 +00:00
Justin Cormack
3b6d1ae4f2 Mount osx 9p db on /mnt
Otherwise interferes with transfused startup.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-28 12:03:02 +00:00
Justin Cormack
eef2e06887 Merge pull request #1107 from justincormack/dockerup
Update to Docker 1.13.1-rc1
2017-01-28 10:42:04 +00:00
Justin Cormack
c67038a5d3 Merge pull request #1106 from justincormack/aufsup
Update to AUFS 20170130
2017-01-28 10:28:12 +00:00
Justin Cormack
25c357b375 Update to Docker 1.13.1-rc1
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-28 10:16:15 +00:00
Justin Cormack
79d210e70b Update to AUFS 20170130
This now includes the patch we were carrying.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-28 10:11:57 +00:00
Justin Cormack
1f8bdc0c47 Merge pull request #1104 from rneugeba/patch-up
kernel: Update 4.9.6 patches
2017-01-27 18:09:46 +00:00
Rolf Neugebauer
5e3865e030 kernel: Update 4.9.6 patches
- Update VMBus lockup patch (0009) based on the one submitted to LKML
- Remove hack to forcea TimeSync protocol to version 3 (0005)
- Properly cherry-pick patch 0008 (was missing the cherry-pick reference)
- Add a new patch which properly negotiates the TimeSync protocol (0012)
- The latter required cherry-picking 0010 and 0011

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-01-27 16:12:24 +00:00
Justin Cormack
8b0d65af21 Merge pull request #1099 from riyazdf/kernup
Update kernels to 4.9.6 and 4.4.45
2017-01-27 09:01:52 +00:00
Riyaz Faizullabhoy
07e9208236 Update kernels to 4.9.6 and 4.4.45
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-01-26 17:25:22 -08:00
Justin Cormack
608a5efade Merge pull request #1096 from justincormack/tartar
Rework container creation
2017-01-26 07:16:13 +00:00
Justin Cormack
7d14547e87 Rework container creation
- simplify the process by having the riddler container build the rootfs and config
- output tarred up rootfs and config.json as otherwise file ownership not preserved
- allow easy build of a collection of container tarballs with another conversion script

This makes it easy to choose which container images you want and just convert any
set to a initrd image
```
tar cf - container1.tar container2.tar | docker run -i tartar2initrd > initrd.img
```

Next stage will use a manifest to select the ones to add for each edition.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-25 22:53:28 +00:00
Justin Cormack
67833e272f Add an sshd container
This is mainly for testing.

You can run with something like
```
docker run -v ~/.ssh/id_rsa.pub:/root/.ssh/authorized_keys -p 2222:22 -e TINI_SUBREAPER=1 --pid=host mobylinux/sshd:36c44542d8120e384c724a078e3e489f7a58382c
```

if you want to run in the host pid namespace. You must provide an
authorized key, you may provide a host key.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-25 16:34:05 +00:00
Justin Cormack
7c9450cf48 Merge pull request #1093 from justincormack/diag-early
Start diagnostics server earlier, before Docker
2017-01-25 16:02:11 +00:00
Justin Cormack
fa4f1aaedc Start diagnostics server earlier, before Docker
Allows it to be used to see what the boot state is.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-25 15:17:55 +00:00
Justin Cormack
537ad4e34d Merge pull request #1092 from justincormack/gce-clean
Clean up gce image
2017-01-25 09:24:58 +00:00
Justin Cormack
53c146d804 Clean up gce image
Was missing in `make clean` and not noticed as we do not build by default.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-25 00:22:08 +00:00
Justin Cormack
3d03a8ae9b Merge pull request #1090 from nathanleclaire/chown_azure_proper
Chown azure proper
2017-01-25 00:20:39 +00:00
Justin Cormack
2a5d323320 Merge pull request #1091 from justincormack/qemu-run
Use docker run to run tests and interactive containers
2017-01-25 00:16:06 +00:00
Nathan LeClaire
9bd4680e09 Modify init script to create+chown proper directory
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2017-01-24 15:53:19 -08:00
Justin Cormack
007a42ad41 Use docker run to run tests and interactive containers
Using docker build is slower and needs lots of Dockerfiles,
while a single image with a careful script can accept any type
of image, either with `-v` to share into `/tmp` for interactive
use (where you need the input and a tty, or by adding a tarball
for cases where there is no login such as running tests, so you
can still use a remote daemon in these cases.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-24 23:41:06 +00:00
Justin Cormack
b33cee3fc7 Merge pull request #1088 from justincormack/move-base
Move base images directory to top level
2017-01-24 20:48:36 +00:00
Justin Cormack
f8e0a3d61c Move base images directory to top level
These are standalone, better to have them at the top.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-24 18:55:23 +00:00
Justin Cormack
f27c3ff5ed Move ebpf to its own directory
Unlike the other images in `base` this needs parts from the
Moby build so move it for now.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-24 18:50:38 +00:00
Justin Cormack
b53e83d695 Merge pull request #1086 from justincormack/new-containerd
Shift to development track containerd
2017-01-24 17:50:45 +00:00
Justin Cormack
89e98eefa0 Shift to development track containerd
Move to the development track of `containerd` not the legacy 0.2
branch. The commands have changed a bit.

This does increase the image size as we are bundling the Docker
copy and our copy, and the new one is larger as it is growing features.
Hopefully Docker will shrink eventually. Also we may replace `ctr`
with a library.

Fix #1029

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-24 15:39:44 +00:00