alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

use tini to run every container (#1195)

Browse Source 
fixes #1101

additional context:

* this was introduced in docker 1.13 (1/2017), we require docker 17.10
(10/2017), this should not have any issues dependency-wise, as `docker-init`
is in the docker install from that point in time. unless explicitly removed,
it should be in the dind container we use as well...
* the PR that introduced this to docker is
https://github.com/moby/moby/pull/26061 for additional context
* it may be wise to put this through some paces, if anybody has any...
interesting... function containers. the tests seem to work fine, however, and
this shouldn't be something users have to think about (?) at all, just
something that we are doing. this isn't the default in docker for
compatibility reasons, which is maybe a yellow flag but I am not sure tbh
This commit is contained in:
Reed Allman
2018-09-04 15:41:30 -07:00
committed by GitHub
parent dee4171be1
commit 7638b31e11
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/agent/agent.go
View File

@@ -219,6 +219,7 @@ func NewDockerDriver(cfg *Config) (drivers.Driver, error) {
PreForkNetworks: cfg.PreForkNetworks, PreForkNetworks: cfg.PreForkNetworks,
MaxTmpFsInodes: cfg.MaxTmpFsInodes, MaxTmpFsInodes: cfg.MaxTmpFsInodes,
EnableReadOnlyRootFs: !cfg.DisableReadOnlyRootFs, EnableReadOnlyRootFs: !cfg.DisableReadOnlyRootFs,
EnableTini: !cfg.DisableTini,
}) })
} }

3
api/agent/config.go
View File

@@ -33,6 +33,7 @@ type Config struct {
EnableNBResourceTracker bool `json:"enable_nb_resource_tracker"` EnableNBResourceTracker bool `json:"enable_nb_resource_tracker"`
MaxTmpFsInodes uint64 `json:"max_tmpfs_inodes"` MaxTmpFsInodes uint64 `json:"max_tmpfs_inodes"`
DisableReadOnlyRootFs bool `json:"disable_readonly_rootfs"` DisableReadOnlyRootFs bool `json:"disable_readonly_rootfs"`
DisableTini bool `json:"disable_tini"`
DisableDebugUserLogs bool `json:"disable_debug_user_logs"` DisableDebugUserLogs bool `json:"disable_debug_user_logs"`
} }
@@ -84,6 +85,8 @@ const (
EnvMaxTmpFsInodes = "FN_MAX_TMPFS_INODES" EnvMaxTmpFsInodes = "FN_MAX_TMPFS_INODES"
// EnvDisableReadOnlyRootFs makes the root fs for a container have rw permissions, by default it is read only // EnvDisableReadOnlyRootFs makes the root fs for a container have rw permissions, by default it is read only
EnvDisableReadOnlyRootFs = "FN_DISABLE_READONLY_ROOTFS" EnvDisableReadOnlyRootFs = "FN_DISABLE_READONLY_ROOTFS"
// EnvDisableTini runs containers without using the --init option, for tini pid 1 action
EnvDisableTini = "FN_DISABLE_TINI"
// EnvDisableDebugUserLogs disables user function logs being logged at level debug. wise to enable for production. // EnvDisableDebugUserLogs disables user function logs being logged at level debug. wise to enable for production.
EnvDisableDebugUserLogs = "FN_DISABLE_DEBUG_USER_LOGS" EnvDisableDebugUserLogs = "FN_DISABLE_DEBUG_USER_LOGS"

1
api/agent/drivers/docker/docker.go
View File

@@ -223,6 +223,7 @@ func (drv *DockerDriver) CreateCookie(ctx context.Context, task drivers.Containe
}, },
HostConfig: &docker.HostConfig{ HostConfig: &docker.HostConfig{
ReadonlyRootfs: drv.conf.EnableReadOnlyRootFs, ReadonlyRootfs: drv.conf.EnableReadOnlyRootFs,
Init: drv.conf.EnableTini,
}, },
Context: ctx, Context: ctx,
} }

3
api/agent/drivers/driver.go
View File

@@ -224,6 +224,8 @@ const (
) )
type Config struct { type Config struct {
// TODO this should all be driver-specific config and not in the
// driver package itself. fix if we ever one day try something else
Docker string `json:"docker"` Docker string `json:"docker"`
DockerNetworks string `json:"docker_networks"` DockerNetworks string `json:"docker_networks"`
DockerLoadFile string `json:"docker_load_file"` DockerLoadFile string `json:"docker_load_file"`
@@ -235,6 +237,7 @@ type Config struct {
PreForkNetworks string `json:"pre_fork_networks"` PreForkNetworks string `json:"pre_fork_networks"`
MaxTmpFsInodes uint64 `json:"max_tmpfs_inodes"` MaxTmpFsInodes uint64 `json:"max_tmpfs_inodes"`
EnableReadOnlyRootFs bool `json:"enable_readonly_rootfs"` EnableReadOnlyRootFs bool `json:"enable_readonly_rootfs"`
EnableTini bool `json:"enable_tini"`
} }
func average(samples []Stat) (Stat, bool) { func average(samples []Stat) (Stat, bool) {