Commit Graph

451 Commits

Author SHA1 Message Date
Rolf Neugebauer
e44783fea1 pkg: Update alpine base for all packages
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:46:10 +01:00
Rolf Neugebauer
0ebb53c491 build: Add the ability to only build/push/sign for specific architectures
A package makefile can specify a list of architectures ('ARCHES')
it supports. If build on a unsupported architecture, a message is
printed and make exits without an error.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Rolf Neugebauer
981def7c7a build: Add show-tag and forcetag targets to pkg Makefile
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Rolf Neugebauer
c8e0d2ca28 pkg: Add invocation to push-manifest to generic package build
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-03 17:36:22 +01:00
Rolf Neugebauer
47af521e14 Merge pull request #2343 from justincormack/x-sys-unix-rngd
rngd improvements
2017-08-03 15:45:40 +01:00
Justin Cormack
4434ecc4af Support multiple CDROMS in metadata
This checks if any CDROM in the system has metadata. Useful if
you boot off CDROM and also have a metadata CDROM.

Also switch the metadata container to read only, as it is only
writing to bind mounted in directories, and /tmp.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-08-03 14:16:02 +01:00
Justin Cormack
f768ac4bfd Add flags to disable the different random sources
This makes testing the different options much easier.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2017-08-02 20:55:36 +01:00
Justin Cormack
63798997f6 Convert rngd to use x/sys/unix
Epoll in `syscall` package does not work on arm64. We do not have
arm64 yet here, but we will when we add tpm support etc.

Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2017-08-02 20:09:43 +01:00
Rolf Neugebauer
767ac54971 pkg/init-lcow: Update opengcs to the latest version
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-08-01 17:06:12 +01:00
Justin Cormack
4daf008956 Merge pull request #2331 from justincormack/rng-golang
Replace rngd with a Go version
2017-08-01 10:56:10 +01:00
Justin Cormack
b1c80b54b3 Revert #2317 remove kernel.random.write_wakeup_threshold from sysctl
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 23:05:46 +01:00
Justin Cormack
737fbcb3b6 Add standard directories in /var
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 21:09:48 +01:00
Justin Cormack
e0bc13451f Replace rngd with a Go version
Only supports the use cases we currently need, currently support
for using Intel hardware rng to initialise and add entropy.

Supports oneshot and service mode. Call as `rngd -1` for one shot
mode.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 20:16:26 +01:00
Justin Cormack
1412cf8835 Fix mode of created directories in mountie
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 17:31:40 +01:00
Justin Cormack
2c20ee2f8a Use a tmpfs for /var
Previously we were cheating and remounting /var `rw` but this does not
work if the filesystem is really read only. Nount a tmpfs, which may
be overmounted later by a persistent filesystem.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 15:25:54 +01:00
Justin Cormack
5ea2eaead1 Merge pull request #2309 from justincormack/ro-rw-setup
Use overlay for writeable containers
2017-07-31 15:25:09 +01:00
Justin Cormack
eacce1d52e Use overlay for writeable containers
Previously we would sneakily remount as `rw` but of course you can't
really do that on a truly immutable filesystem.

See https://github.com/moby/tool/pull/129 for the `moby` side.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-31 13:48:23 +01:00
Dennis Chen
bbfb7a7442 pkg/getty: Add ARM 'ttyAMA0' console into securetty
We need to add 'ttyAMA0' console used on ARM64 platform into
securetty file to make it's possible to log into the system
as root. Also it will dismiss the below warning message before
login:
"getty: cmdline has console=ttyAMA0 but does not exist in
/etc/securetty; will not be able to log in as root on this tty ttyAMA0."

'ttyAMA1' is also added order to handle some system happens have that one
instead of 'ttyAMA0'

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-07-31 10:27:03 +00:00
Riyaz Faizullabhoy
ade82574e6 Merge pull request #2317 from justincormack/sysctl-fix
Remove kernel.random.write_wakeup_threshold from sysctl
2017-07-28 13:22:38 -07:00
Justin Cormack
980a469bbc Remove kernel.random.write_wakeup_threshold from sysctl
3072 is the default value anyway, so no need to change.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-28 17:56:13 +01:00
Dennis Chen
d9e5e41df3 package.mk: Adjust the targe sequence to avoid early abort
Current package.mk will operate on the first dependence object
'check-dirty', which will result the make process abort earlier
with below message:
pkg/package.mk:60: *** Your repository is not clean. Will not push package image.  Stop.

This is not expected behavior since we have no chance to build
a docker image locally in case of the user has no intention to
push that image.

This patch adjust the dependece order for the default target, thus
we can build the docker image locally but can't push that image
since we're in a dirty git repository.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
2017-07-28 11:05:26 +00:00
Justin Cormack
9a823cf2e2 Add mountpoint to binfmt image
As this is read only it should be explicitly created.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-27 15:05:48 +01:00
Avi Deitcher
8f10f69fd3 Merge pull request #2233 from dave-tucker/ns-detect
getty: Detect if you are in a namespace
2017-07-27 16:50:02 +03:00
Avi Deitcher
543e61c643 Fix typo
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-27 15:38:20 +03:00
Justin Cormack
16674a1557 Merge pull request #2306 from ijc/containerd-v1.0.0-alpha2
Containerd v1.0.0 alpha2
2017-07-27 13:30:24 +01:00
Dave Tucker
f41c976406 getty: Detect if you are in a namespace
This is an attempt at fixing #2213

If `INITGETTY` has been set then we are not in a namespace.

Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-27 14:55:28 +03:00
Ian Campbell
8eb6709a3c containerd: Bump to new alpine (with v1.0.0-alpha2)
The logrus import path has changed, so adjust. Also there is a minor API change
to the containerd.IOCreation() function spec, it now takes a string id which we
can ignore.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-27 11:07:03 +01:00
Rolf Neugebauer
a18f4403d0 pkg/init-lcow: Update opengcs to latest
While at it, might as well update linuxkit/alpine to the latest.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
2017-07-27 10:47:19 +01:00
Justin Cormack
941e31a519 Merge pull request #2278 from deitch/tpm-tools
tpm tools
2017-07-26 22:01:51 +01:00
Justin Cormack
cb2ca4ef66 Switch runc and containerd startup to be entirely Go
At present they use a small shared function called "prepare"
that does the read-write remounts, that I will switch to doing overlay
mounts soon.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-26 16:32:09 +01:00
Justin Cormack
5194bf13d1 Merge pull request #2296 from justincormack/service-does-more
Make service start up containerd and services
2017-07-26 15:34:03 +01:00
Rolf Neugebauer
2b76e86500 Merge pull request #2152 from dave-tucker/multi-mount
Improve mount and format packages
2017-07-26 14:39:28 +01:00
Justin Cormack
b8f7b7aad0 Merge pull request #2294 from ijc/pkg-forcepush
pkg: Add forcepush target
2017-07-26 13:43:12 +01:00
Dave Tucker
8dcb57429a pkg: Add extend for extending partitions
This was split out from pkg/format into its own package.
It has the ability to extend ext4, btrfs and xfs partitions.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-07-26 13:26:39 +01:00
Dave Tucker
a14a8be49e mount: Add support to mount by label, uuid or name
This commit rewrites the mount package in Go.
It adds the ability to mount the by label, UUID or name.
It also fixes the automatic mount logic to check that a drive isn't
already mounted before attempting to mount it. This allows for multiple
uses of the mount pkg in a single YAML file.

Signed-off-by: Dave Tucker <dt@docker.com>
2017-07-26 13:26:39 +01:00
Dave Tucker
5273ec1d33 format: Add partition labels and new filesystems
This commit re-writes the format package in Go and adds the ability to
add partition labels and also specify either ext4, btrfs or xfs

Signed-off-by: Dave Tucker <dt@docker.com>
2017-07-26 13:26:39 +01:00
Justin Cormack
e40db14598 Make service start up containerd and services
This moves most of the initialisation of containers to the
service init in the `service` command.

Still leaves remounting root file systems read only but this
will go away shortly. Another step closer to removing shell
scripts in base system.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-26 12:05:45 +01:00
Avi Deitcher
e776d063ac add tss image
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-26 13:46:51 +03:00
Ian Campbell
6c689a84dd pkg: Add forcepush target
This is like the `push` target but omits the pulls and depends on forcetag
instead. With the git commit now being embedded into the image this is now a
necessary part of rebasing a PR for which images have already been pushed.

Also adds PHONY targets for existing forcetag and push targets which were
missing.

NB $(error) appends a "." to omit the final one from the error message

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-26 10:45:04 +01:00
Justin Cormack
797392a244 fix openntpd label
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-25 16:25:09 +01:00
Justin Cormack
1e236e9f0c Update build labels for new resolv.conf bind mount
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-25 15:30:24 +01:00
Justin Cormack
a81d2deb61 Do not try to change /etc/resolv.conf
The filesystem is supposed to be immutable, so do not try to make
a symlink; new versions of moby tool should add one anyway. But
try to make the directory a symlink points to, assuming that it
will be on a writeable filesystem.

fix #1920
see also #2288

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-25 15:30:24 +01:00
Justin Cormack
6307ec9cd1 Rewrite /init in Go
This uses a more memory efficient copy, and gets us closer to
not having a shell in the base system if not required.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-07-24 15:01:58 +01:00
Avi Deitcher
8de1d9bf2c Mount /var/log to getty and ssh again
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2017-07-21 19:11:22 +03:00
Jason A. Donenfeld
ec7dadcddd wireguard: add to getty and sshd
People really want to play around with this, so adding them here makes
it possible. Just as iproute2 is part of these, so should
wireguard-tools.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2017-07-20 23:50:13 +02:00
Ian Campbell
c48acd5d9d sshd+getty: Add apk to these containers
Since these are the user login containers, having the ability to add packages
is useful (e.g. I quite often find I want strace).

Doing this requires that we not share `/var` with the login containers since we
want the apk database therein. Previously it was thought that the containers
might need some parts of `/var` for `ctr` to work (e.g. `/var/lib/containerd`)
but this is not the case now (if it ever was) based on my testing.

Fixes #2206.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 15:08:27 +01:00
Justin Cormack
5545f3085a Merge pull request #2258 from ijc/containerd-v1.0.0-alpha1
Containerd v1.0.0 alpha1
2017-07-20 15:07:24 +01:00
Ian Campbell
b3db1a887c Update to containerd v1.0.0-alpha1
This is actually containerd#1141 rebased onto v1.0.0-alpha1.

The `dist` command has been integreated into `ctr` and so is removed, including
from the getty and sshd bind mounts and the test which uses it is updated..

There is no change to the version of runc vendored by containerd, so this is
unchanged.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-07-20 14:10:51 +01:00
Rolf Neugebauer
c1eacd07b7 Merge pull request #2256 from djs55/secrets
metadata: avoid printing large chunks of configuration json to the console
2017-07-20 13:17:50 +01:00
David Scott
5bf6526380 metadata: avoid printing large chunks of configuration json to the console
If the configuration .json has contents like:

{
  "etc": {
    "ssl": {
      "certs": {
        "ca-certificates.crt": {
          "perm": "0644",
          "content": "large amount of certificate text"
        }
      }
    }
  },
...
}

then we print a warning because the node "ssl" has no "perm".
Previously the warning would include the contents of "ssl", which
would be large (and in theory could include secret information).

This patch modifies the warning print to only print the key and
not the value.

Without this patch, I see on the console:

2017/07/20 10:03:04 CDROM: Probe succeeded
2017/07/20 10:03:04 No permission provided ssl:map[certs:map[ca-certificates.crt:map[perm:0644 content:large amount of certificate text]]]
 - 000-metadata

With this patch, I see on the console:

2017/07/20 09:54:18 CDROM: Probe succeeded
2017/07/20 09:54:18 No permission provided ssl
 - 000-metadata

Signed-off-by: David Scott <dave.scott@docker.com>
2017-07-20 11:10:59 +01:00