bottlerocket-os · arnaldo2792 · Jul 26, 2023 · Jul 10, 2023 · Jul 19, 2023 · Jul 19, 2023
diff --git a/packages/docker-engine/daemon-json b/packages/docker-engine/daemon-json
@@ -3,7 +3,6 @@
   "live-restore": true,
   "max-concurrent-downloads": 10,
   "storage-driver": "overlay2",
-  "exec-opts": ["native.cgroupdriver=cgroupfs"],
   "data-root": "/var/lib/docker",
   "default-runtime": "shimpei",
   "runtimes": { "shimpei": { "path": "shimpei" } },

diff --git a/packages/docker-engine/daemon-nvidia-json b/packages/docker-engine/daemon-nvidia-json
@@ -3,7 +3,6 @@
   "live-restore": true,
   "max-concurrent-downloads": 10,
   "storage-driver": "overlay2",
-  "exec-opts": ["native.cgroupdriver=cgroupfs"],
   "data-root": "/var/lib/docker",
   "default-runtime": "shimpei",
   "runtimes": { "shimpei": { "path": "shimpei" }, "nvidia": { "path": "nvidia-oci" } },

diff --git a/sources/logdog/conf/logdog.aws-ecs-2-nvidia.conf b/sources/logdog/conf/logdog.aws-ecs-2-nvidia.conf
@@ -0,0 +1 @@
+logdog.aws-ecs-1.conf
diff --git a/sources/logdog/conf/logdog.aws-ecs-2.conf b/sources/logdog/conf/logdog.aws-ecs-2.conf
@@ -0,0 +1 @@
+logdog.aws-ecs-1.conf
diff --git a/sources/models/README.md b/sources/models/README.md
@@ -77,6 +77,21 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 * [Model](src/aws-ecs-1/mod.rs)
 * [Default settings](src/aws-ecs-1/defaults.d/)
 
+### aws-ecs-1-nvidia: Amazon ECS NVIDIA
+
+* [Model](src/aws-ecs-1-nvidia/mod.rs)
+* [Default settings](src/aws-ecs-1-nvidia/defaults.d/)
+
+### aws-ecs-2: Amazon ECS
+
+* [Model](src/aws-ecs-1/mod.rs)
+* [Default settings](src/aws-ecs-1/defaults.d/)
+
+### aws-ecs-2-nvidia: Amazon ECS NVIDIA
+
+* [Model](src/aws-ecs-1-nvidia/mod.rs)
+* [Default settings](src/aws-ecs-1-nvidia/defaults.d/)
+
 ### aws-dev: AWS development build
 
 * [Model](src/aws-dev/mod.rs)

diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/10-defaults.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/10-defaults.toml
@@ -0,0 +1 @@
+../../../shared-defaults/defaults.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/15-aws-tuf.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/15-aws-tuf.toml
@@ -0,0 +1 @@
+../../../shared-defaults/aws-tuf.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/20-aws-host-containers.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/20-aws-host-containers.toml
@@ -0,0 +1 @@
+../../../shared-defaults/aws-host-containers.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/25-cf-signal.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/25-cf-signal.toml
@@ -0,0 +1 @@
+../../../shared-defaults/cf-signal.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/26-aws-autoscaling.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/26-aws-autoscaling.toml
@@ -0,0 +1 @@
+../../../shared-defaults/aws-autoscaling.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/30-metrics.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/30-metrics.toml
@@ -0,0 +1 @@
+../../../shared-defaults/metrics.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/31-send-metrics-aws.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/31-send-metrics-aws.toml
@@ -0,0 +1 @@
+../../../shared-defaults/send-metrics-aws.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/51-docker-services.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/51-docker-services.toml
@@ -0,0 +1 @@
+../../../shared-defaults/docker-services.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/52-aws-ecs-1.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/52-aws-ecs-1.toml
@@ -0,0 +1 @@
+../../../shared-defaults/ecs.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/53-docker-daemon.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/53-docker-daemon.toml
@@ -0,0 +1 @@
+../../../shared-defaults/docker-daemon-nvidia.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/54-docker-pki.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/54-docker-pki.toml
@@ -0,0 +1 @@
+../../../shared-defaults/docker-pki.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/60-lockdown-none.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/60-lockdown-none.toml
@@ -0,0 +1 @@
+../../../shared-defaults/lockdown-none.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/70-oci-hooks.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/70-oci-hooks.toml
@@ -0,0 +1 @@
+../../../shared-defaults/nvidia-oci-hooks-docker.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/defaults.d/80-boot.toml b/sources/models/src/aws-ecs-2-nvidia/defaults.d/80-boot.toml
@@ -0,0 +1 @@
+../../../shared-defaults/boot.toml
diff --git a/sources/models/src/aws-ecs-2-nvidia/mod.rs b/sources/models/src/aws-ecs-2-nvidia/mod.rs
@@ -0,0 +1,33 @@
+use model_derive::model;
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use crate::modeled_types::Identifier;
+use crate::{
+    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
+    DnsSettings, ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings,
+    NtpSettings, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
+};
+
+// Note: we have to use 'rename' here because the top-level Settings structure is the only one
+// that uses its name in serialization; internal structures use the field name that points to it
+#[model(rename = "settings", impl_default = true)]
+struct Settings {
+    motd: String,
+    updates: UpdatesSettings,
+    host_containers: HashMap<Identifier, HostContainer>,
+    bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
+    ntp: NtpSettings,
+    network: NetworkSettings,
+    kernel: KernelSettings,
+    boot: BootSettings,
+    aws: AwsSettings,
+    ecs: ECSSettings,
+    metrics: MetricsSettings,
+    pki: HashMap<Identifier, PemCertificate>,
+    container_registry: RegistrySettings,
+    oci_hooks: OciHooks,
+    cloudformation: CloudFormationSettings,
+    autoscaling: AutoScalingSettings,
+    dns: DnsSettings,
+}
diff --git a/sources/models/src/aws-ecs-2/defaults.d/10-defaults.toml b/sources/models/src/aws-ecs-2/defaults.d/10-defaults.toml
@@ -0,0 +1 @@
+../../../shared-defaults/defaults.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/15-aws-tuf.toml b/sources/models/src/aws-ecs-2/defaults.d/15-aws-tuf.toml
@@ -0,0 +1 @@
+../../../shared-defaults/aws-tuf.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/20-aws-host-containers.toml b/sources/models/src/aws-ecs-2/defaults.d/20-aws-host-containers.toml
@@ -0,0 +1 @@
+../../../shared-defaults/aws-host-containers.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/25-cf-signal.toml b/sources/models/src/aws-ecs-2/defaults.d/25-cf-signal.toml
@@ -0,0 +1 @@
+../../../shared-defaults/cf-signal.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/26-aws-autoscaling.toml b/sources/models/src/aws-ecs-2/defaults.d/26-aws-autoscaling.toml
@@ -0,0 +1 @@
+../../../shared-defaults/aws-autoscaling.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/30-metrics.toml b/sources/models/src/aws-ecs-2/defaults.d/30-metrics.toml
@@ -0,0 +1 @@
+../../../shared-defaults/metrics.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/31-send-metrics-aws.toml b/sources/models/src/aws-ecs-2/defaults.d/31-send-metrics-aws.toml
@@ -0,0 +1 @@
+../../../shared-defaults/send-metrics-aws.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/51-docker-services.toml b/sources/models/src/aws-ecs-2/defaults.d/51-docker-services.toml
@@ -0,0 +1 @@
+../../../shared-defaults/docker-services.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/52-aws-ecs-1.toml b/sources/models/src/aws-ecs-2/defaults.d/52-aws-ecs-1.toml
@@ -0,0 +1 @@
+../../../shared-defaults/ecs.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/53-docker-pki.toml b/sources/models/src/aws-ecs-2/defaults.d/53-docker-pki.toml
@@ -0,0 +1 @@
+../../../shared-defaults/docker-pki.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/60-lockdown-integrity.toml b/sources/models/src/aws-ecs-2/defaults.d/60-lockdown-integrity.toml
@@ -0,0 +1 @@
+../../../shared-defaults/lockdown-integrity.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/70-oci-hooks.toml b/sources/models/src/aws-ecs-2/defaults.d/70-oci-hooks.toml
@@ -0,0 +1 @@
+../../../shared-defaults/oci-hooks.toml
diff --git a/sources/models/src/aws-ecs-2/defaults.d/80-boot.toml b/sources/models/src/aws-ecs-2/defaults.d/80-boot.toml
@@ -0,0 +1 @@
+../../../shared-defaults/boot.toml
diff --git a/sources/models/src/aws-ecs-2/mod.rs b/sources/models/src/aws-ecs-2/mod.rs
@@ -0,0 +1,33 @@
+use model_derive::model;
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+use crate::modeled_types::Identifier;
+use crate::{
+    AutoScalingSettings, AwsSettings, BootSettings, BootstrapContainer, CloudFormationSettings,
+    DnsSettings, ECSSettings, HostContainer, KernelSettings, MetricsSettings, NetworkSettings,
+    NtpSettings, OciHooks, PemCertificate, RegistrySettings, UpdatesSettings,
+};
+
+// Note: we have to use 'rename' here because the top-level Settings structure is the only one
+// that uses its name in serialization; internal structures use the field name that points to it
+#[model(rename = "settings", impl_default = true)]
+struct Settings {
+    motd: String,
+    updates: UpdatesSettings,
+    host_containers: HashMap<Identifier, HostContainer>,
+    bootstrap_containers: HashMap<Identifier, BootstrapContainer>,
+    ntp: NtpSettings,
+    network: NetworkSettings,
+    kernel: KernelSettings,
+    boot: BootSettings,
+    aws: AwsSettings,
+    ecs: ECSSettings,
+    metrics: MetricsSettings,
+    pki: HashMap<Identifier, PemCertificate>,
+    container_registry: RegistrySettings,
+    oci_hooks: OciHooks,
+    cloudformation: CloudFormationSettings,
+    autoscaling: AutoScalingSettings,
+    dns: DnsSettings,
+}
diff --git a/sources/models/src/lib.rs b/sources/models/src/lib.rs
@@ -74,6 +74,21 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 * [Model](src/aws-ecs-1/mod.rs)
 * [Default settings](src/aws-ecs-1/defaults.d/)
 
+## aws-ecs-1-nvidia: Amazon ECS NVIDIA
+
+* [Model](src/aws-ecs-1-nvidia/mod.rs)
+* [Default settings](src/aws-ecs-1-nvidia/defaults.d/)
+
+## aws-ecs-2: Amazon ECS
+
+* [Model](src/aws-ecs-1/mod.rs)
+* [Default settings](src/aws-ecs-1/defaults.d/)
+
+## aws-ecs-2-nvidia: Amazon ECS NVIDIA
+
+* [Model](src/aws-ecs-1-nvidia/mod.rs)
+* [Default settings](src/aws-ecs-1-nvidia/defaults.d/)
+
 ## aws-dev: AWS development build
 
 * [Model](src/aws-dev/mod.rs)

diff --git a/variants/Cargo.lock b/variants/Cargo.lock
diff --git a/variants/Cargo.toml b/variants/Cargo.toml
@@ -2,7 +2,9 @@
 members = [
     "aws-dev",
     "aws-ecs-1",
+    "aws-ecs-2",
     "aws-ecs-1-nvidia",
+    "aws-ecs-2-nvidia",
     "aws-k8s-1.23",
     "aws-k8s-1.23-nvidia",
     "aws-k8s-1.24",

diff --git a/variants/README.md b/variants/README.md
@@ -114,6 +114,17 @@ The [aws-ecs-1-nvidia](aws-ecs-1-nvidia/Cargo.toml) variant includes the package
 container instance in AWS.
 It also includes the required packages to configure containers to leverage NVIDIA GPUs.
 
+### aws-ecs-2: Amazon ECS container instance
+
+The [aws-ecs-2](aws-ecs-2/Cargo.toml) variant includes the packages needed to run an [Amazon ECS](https://ecs.aws)
+container instance in AWS.
+
+### aws-ecs-2-nvidia: Amazon ECS container instance
+
+The [aws-ecs-2-nvidia](aws-ecs-2-nvidia/Cargo.toml) variant includes the packages needed to run an [Amazon ECS](https://ecs.aws)
+container instance in AWS.
+It also includes the required packages to configure containers to leverage NVIDIA GPUs.
+
 ### aws-dev: AWS development build
 
 The [aws-dev](aws-dev/Cargo.toml) variant has useful packages for local development of the OS.

diff --git a/variants/aws-ecs-2-nvidia/Cargo.toml b/variants/aws-ecs-2-nvidia/Cargo.toml
@@ -0,0 +1,60 @@
+[package]
+name = "aws-ecs-2-nvidia"
+version = "0.1.0"
+edition = "2021"
+publish = false
+build = "../build.rs"
+
+[package.metadata.build-variant.image-features]
+grub-set-private-var = true
+unified-cgroup-hierarchy = true
+uefi-secure-boot = true
+xfs-data-partition = true
+
+[package.metadata.build-variant.image-layout]
+os-image-size-gib = 4
+
+[package.metadata.build-variant]
+included-packages = [
+# core
+    "release",
+    "kernel-6.1",
+# docker
+    "docker-cli",
+    "docker-engine",
+    "docker-init",
+    "docker-proxy",
+# ecs
+    "ecs-agent",
+# NVIDIA support
+    "ecs-gpu-init",
+    "nvidia-container-toolkit",
+    "kmod-6.1-nvidia-tesla-535",
+]
+
+kernel-parameters = [
+    "console=tty0",
+    "console=ttyS0,115200n8",
+    "net.ifnames=0",
+    "netdog.default-interface=eth0:dhcp4,dhcp6?",
+    "quiet",
+]
+
+[lib]
+path = "../variants.rs"
+
+[build-dependencies]
+# core
+release = { path = "../../packages/release" }
+kernel-6_1 = { path = "../../packages/kernel-6.1" }
+# docker
+docker-cli = { path = "../../packages/docker-cli" }
+docker-engine = { path = "../../packages/docker-engine" }
+docker-init = { path = "../../packages/docker-init" }
+docker-proxy = { path = "../../packages/docker-proxy" }
+# ecs
+ecs-agent = { path = "../../packages/ecs-agent" }
+# NVIDIA
+ecs-gpu-init = { path = "../../packages/ecs-gpu-init" }
+nvidia-container-toolkit = { path = "../../packages/nvidia-container-toolkit" }
+kmod-6_1-nvidia = { path = "../../packages/kmod-6.1-nvidia" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../shared-defaults/aws-host-containers.toml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../shared-defaults/docker-daemon-nvidia.toml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../shared-defaults/nvidia-oci-hooks-docker.toml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../shared-defaults/lockdown-integrity.toml