From 25afb2f4789abfd1b54ac3c7d31e9ed6aafea6fd Mon Sep 17 00:00:00 2001
From: Tolga Ceylan <tolga.ceylan@gmail.com>
Date: Wed, 7 Nov 2018 12:35:19 -0800
Subject: [PATCH] fn: remove tini option & env variable (#1301)

---
 api/agent/agent.go                 | 1 -
 api/agent/config.go                | 3 ---
 api/agent/drivers/docker/docker.go | 2 +-
 api/agent/drivers/driver.go        | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/api/agent/agent.go b/api/agent/agent.go
index 451f4c790..07663b589 100644
--- a/api/agent/agent.go
+++ b/api/agent/agent.go
@@ -226,7 +226,6 @@ func NewDockerDriver(cfg *Config) (drivers.Driver, error) {
 		PreForkNetworks:      cfg.PreForkNetworks,
 		MaxTmpFsInodes:       cfg.MaxTmpFsInodes,
 		EnableReadOnlyRootFs: !cfg.DisableReadOnlyRootFs,
-		EnableTini:           !cfg.DisableTini,
 		MaxRetries:           cfg.MaxDockerRetries,
 	})
 }
diff --git a/api/agent/config.go b/api/agent/config.go
index a30514d01..2c6a0df89 100644
--- a/api/agent/config.go
+++ b/api/agent/config.go
@@ -31,7 +31,6 @@ type Config struct {
 	EnableNBResourceTracker bool          `json:"enable_nb_resource_tracker"`
 	MaxTmpFsInodes          uint64        `json:"max_tmpfs_inodes"`
 	DisableReadOnlyRootFs   bool          `json:"disable_readonly_rootfs"`
-	DisableTini             bool          `json:"disable_tini"`
 	DisableDebugUserLogs    bool          `json:"disable_debug_user_logs"`
 	IOFSEnableTmpfs         bool          `json:"iofs_enable_tmpfs"`
 	IOFSAgentPath           string        `json:"iofs_path"`
@@ -83,8 +82,6 @@ const (
 	EnvMaxTmpFsInodes = "FN_MAX_TMPFS_INODES"
 	// EnvDisableReadOnlyRootFs makes the root fs for a container have rw permissions, by default it is read only
 	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 = "FN_DISABLE_DEBUG_USER_LOGS"
 
diff --git a/api/agent/drivers/docker/docker.go b/api/agent/drivers/docker/docker.go
index c3f46dde7..26afd05e9 100644
--- a/api/agent/drivers/docker/docker.go
+++ b/api/agent/drivers/docker/docker.go
@@ -231,7 +231,7 @@ func (drv *DockerDriver) CreateCookie(ctx context.Context, task drivers.Containe
 		},
 		HostConfig: &docker.HostConfig{
 			ReadonlyRootfs: drv.conf.EnableReadOnlyRootFs,
-			Init:           drv.conf.EnableTini,
+			Init:           true,
 		},
 	}
 
diff --git a/api/agent/drivers/driver.go b/api/agent/drivers/driver.go
index 08fc4f066..fbf1a65d8 100644
--- a/api/agent/drivers/driver.go
+++ b/api/agent/drivers/driver.go
@@ -251,7 +251,6 @@ type Config struct {
 	PreForkNetworks      string `json:"pre_fork_networks"`
 	MaxTmpFsInodes       uint64 `json:"max_tmpfs_inodes"`
 	EnableReadOnlyRootFs bool   `json:"enable_readonly_rootfs"`
-	EnableTini           bool   `json:"enable_tini"`
 	MaxRetries           uint64 `json:"max_retries"`
 }