Commit Graph

3896 Commits

Author SHA1 Message Date
Rolf Neugebauer
aaf19172ef Merge pull request #2141 from riyazdf/sig-announce-memorizer
sig-security: add announcement for memorizer
2017-07-01 01:15:47 +01:00
Riyaz Faizullabhoy
997ad2f81b sig-security: add announcement for memorizer
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-30 15:31:23 -07:00
Rolf Neugebauer
422b34cb86 Merge pull request #2140 from rn/kern-up
Update kernels to 4.11.8/4.9.35/4.4.75
2017-06-30 19:32:44 +01:00
Rolf Neugebauer
4c6e0264b9 Update kernels in YAML files
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-30 18:23:29 +01:00
Rolf Neugebauer
8cee2cd68b kernel: Update to 4.11.8/4.9.35/4.4.75
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-30 18:23:29 +01:00
Justin Cormack
9add9622f7 Merge pull request #2137 from MagnusS/split-blueprints
Split DfM blueprint in base and docker yml
2017-06-30 18:02:07 +01:00
Magnus Skjegstad
fcf12d9f5a dfm blueprint: use same port as DfM
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-30 16:03:20 +02:00
Magnus Skjegstad
7c2c3af3c1 tests: update DfM build test to use new blueprint
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-30 16:03:03 +02:00
Magnus Skjegstad
0d3c6d124f blueprints: split dfm blueprint into base and docker yml
Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
2017-06-30 15:41:03 +02:00
Justin Cormack
55957ebb87 Merge pull request #2135 from dave-tucker/fix-2134
Makefile: Fix bug where network was not disabled
2017-06-30 14:29:58 +01:00
Dave Tucker
5a225b9dc5 Makefile: Fix bug where network was not disabled
This commit moves the include statement to the bottom of the file to
ensure that all variables are set before conditionals are evaluated.

I also changed the ifndef NETWORK to ifdef NETWORK as the former was
incorrect. We want `NET_OPTS="--network=none"` in cases where NETWORK is
not defined.

Fixes: #2134

Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-30 11:55:08 +01:00
Rolf Neugebauer
736713dc8f Merge pull request #2120 from dave-tucker/getty
Make it more obvious that getty/sshd are namespaced
2017-06-29 23:30:17 +01:00
Riyaz Faizullabhoy
11e19703a2 Merge pull request #2130 from caminada/master
Bind /etc/docker/daemon.json in examples/docker.yml
2017-06-29 14:42:07 -07:00
Riyaz Faizullabhoy
eacb1d31f3 Merge pull request #2129 from samoht/fdd
sdk: add a file-descriptor sharing server
2017-06-29 14:41:43 -07:00
Daniel Caminada
f298264f63 Bind /etc/docker/daemon.json in examples/docker.yml
Signed-off-by: Daniel Caminada <daniel.caminada@ergon.ch>
2017-06-29 19:55:31 +02:00
Rolf Neugebauer
9d15799700 Merge pull request #2127 from justincormack/dockerup
Update Docker CE to 17.06.0
2017-06-29 17:19:24 +01:00
Thomas Gazagnaire
875b877047 sdk: add Dockerfile root pivot runs + static linking
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-29 18:17:02 +02:00
Thomas Gazagnaire
56229e486b sdk: add a file-descriptor sharing server
```
$ fdd init &
$ fdd share /tmp/foo # serve a fresh socketpair on that path
$ fdd test /tmp/foo  # read the socketpair and test that it works
```

Instead of `fdd test` (which is only useful for testing), users are expected to
connect to the unix domain socket and call `recvmsg(2)`. They will get one side
of the socketpair. Two different processes can do this and they will be able to
talk to each other.

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
2017-06-29 17:53:49 +02:00
Justin Cormack
5c25162c69 Merge pull request #2125 from justincormack/authorsup
Update AUTHORS
2017-06-29 16:50:09 +01:00
Justin Cormack
c8a8bb047c Update docker-ce in Yaml files
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-29 15:30:45 +01:00
Justin Cormack
fed24c4110 Update to Docker 17.06.0-ce
Note that the location of the static binaries changed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-29 15:27:34 +01:00
Dave Tucker
71bccd6967 examples: Update to use new getty and sshd images
Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-29 15:01:33 +01:00
Dave Tucker
5fb025824f getty: Make namespacing more obvious
Warn the user in the MOTD
Add "(ns: getty)" or "(ns: sshd)" to the PS1
Use `agetty` and `-a root` to ensure we get a login shell when insecure

Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-29 14:58:44 +01:00
Justin Cormack
6a3ec73206 Update AUTHORS
Keeping up with the new contributors!

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-29 14:54:20 +01:00
Justin Cormack
99b6da4954 Merge pull request #2116 from justincormack/avi-maintainer
Add Avi Deitcher as a maintainer
2017-06-29 14:38:44 +01:00
Justin Cormack
e771cb82a1 Merge pull request #2109 from riyazdf/metadata-bump
add vultr example
2017-06-29 11:22:46 +01:00
Riyaz Faizullabhoy
9ecd2473a0 Merge pull request #2121 from tych0/auditd-buildsh
auditd: add missing build.sh file
2017-06-28 16:43:24 -07:00
Tycho Andersen
740b97cc90 auditd: update image hash
Riyaz has actually pushed this hash, so let's use it.

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-28 16:44:54 -06:00
Tycho Andersen
b95e28f466 auditd: add missing build.sh file
Whoops :)

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-28 16:25:46 -06:00
Riyaz Faizullabhoy
02e06bf9c9 Merge pull request #2092 from tych0/auditd
add an auditd container
2017-06-28 15:11:30 -07:00
Riyaz Faizullabhoy
7bf535cafb add vultr example
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-28 11:34:46 -07:00
Tycho Andersen
44cbd38650 add an auditd container
Two things to note here: we unfortunately can't just exec audit, because
something needs to load the rules in beforehand.

Second, it also dies if it can't re-nice itself, so we have to give it
CAP_SYS_NICE as well as the audit caps.

I didn't add this to the default linuxkit.yml because the linuxkit/audit
repo doesn't exist yet, but we should probably (?) do that. Additionally,
we should provide the kernel parameter audit=1, otherwise according to
auditd's man pages, we can't audit some early tasks.

Closes #52

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-28 09:15:51 -06:00
Tycho Andersen
31f356fe0e tools/alpine: add abuild and some audit deps
We'll use abuild in the next commit for building auditd from source.

Also add these audit deps:

* swig
* python3
* libcap-ng-dev

Signed-off-by: Tycho Andersen <tycho@docker.com>
2017-06-28 09:10:00 -06:00
Rolf Neugebauer
0b70e7e3a7 Merge pull request #2115 from dave-tucker/rtf-up
Makefile: bump rtf version
2017-06-28 13:55:02 +01:00
Justin Cormack
da024938a8 Add Avi Deitcher as a maintainer
Avi has been contributing to many areas of LinuxKit, including support
for containerised `getty`, encrypted swap and other areas.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-06-28 12:24:19 +01:00
Dave Tucker
ffe6113416 Makefile: bump rtf version
This version includes better sorting of mixed tests/subgroups

Signed-off-by: Dave Tucker <dt@docker.com>
2017-06-28 11:49:01 +01:00
Riyaz Faizullabhoy
ec7f1df1b4 Merge pull request #2112 from djs55/trim-after-delete2
RFC: add "trim after image delete" to the Docker for Mac blueprint
2017-06-27 14:12:00 -07:00
Riyaz Faizullabhoy
fe5b683d8f Merge pull request #2114 from riyazdf/sig-agenda-memorizer
sig-security: agenda for 2017-07-05
2017-06-27 13:28:57 -07:00
Rolf Neugebauer
b4d50ec405 Merge pull request #2113 from rn/pkg
Improve package and kernel builds
2017-06-27 21:19:07 +01:00
David Scott
4a6db6eb51 blueprints: add trim-after-delete to the docker-for-mac
This starts the trim-after-delete daemon which calls
`fstrim /var/lib/docker` after image deletes are observed.

Signed-off-by: David Scott <dave.scott@docker.com>
2017-06-27 20:32:57 +01:00
Rolf Neugebauer
093dae22d5 Update YAML files
- Use the new style kernel tags with the full kernel version
- Update packages with new alpine base and new/simplified Makefiles.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-27 19:56:08 +01:00
Riyaz Faizullabhoy
ce335f71b9 sig-security: agenda for 2017-07-05
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-06-27 11:52:04 -07:00
Rolf Neugebauer
2fb65e8f1e doc: Remove explicit hashes from documentation in ./pkg
People typically update hashes in YAML files with
'git grep ... | sed ...' this will change the README.md files
in the ./pkg directory and thus change the git tree hash.

Remove the use of explicit hashes from those files to avoid
the obvious chicken and egg problem.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-27 18:01:48 +01:00
David Scott
38787b1ddd Add pkg/trim-after-delete
This adds a helper which monitors the Docker event stream and, when it
receives an image delete event, queues a call to `fstrim /var/lib/docker`
to trigger a space reclamation. Previously we would rely on a cron job
running every 15 minutes.

Signed-off-by: David Scott <dave.scott@docker.com>
2017-06-27 17:55:42 +01:00
Rolf Neugebauer
56d94318d9 pkg: Use curl instead of ADD to fetch rng-tools
There seems to be a change in docker 17.06-rc5 on how remote
URLs and tar archives work with ADD. Use curl instead.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-27 17:43:58 +01:00
Rolf Neugebauer
cab27698f4 pkg: Update all packages to the new alpine base
In a subsequent commit, all YAML files will be updated with
new package hashes since all packages needed rebuild due to
build system changes in commit adae27b8d1 ("Simplify
Makefiles for Packages"). So, we might as well bring all
packages up to the latest alpine base package.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-27 17:43:57 +01:00
Rolf Neugebauer
73e5ea8f01 tools: Update the Alpine base image to the latest versions
A subsequent commit will update all packages, so we might as well
update all packages to the latest base.

The new hash is: linuxkit/alpine:c608d404c1cb36cce0c7d9303e30b52c9d81ccf0

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-27 17:43:57 +01:00
Rolf Neugebauer
40ea10065c kernel: Tweak kernel build
- Combine 'sign' and 'push' targets like it is done for
  package builds.
- Append '-dirty' to the tag if the repository is dirty.
- Don't push to hub if the repository is dirty.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-27 17:43:57 +01:00
Rolf Neugebauer
da24542d78 pkg: Improve package build
- Only build if the hash has changed. Previosuly
  we'd unconditionally build and not push of the tag existed.
- Add '.m' to the hash if the repository is dirty.
  This allows developers to build locally without committing
  but makes it clear that the hash is from a modified repository.
- Don't push to hub if the repository is dirty
- If the current commit has a tag, also push this to hub.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-06-27 17:43:57 +01:00
Justin Cormack
e6515cec4b Merge pull request #2104 from ijc/test-ctr-over-getty
test: ensure ctr works in getty container
2017-06-27 16:48:17 +01:00