support container command setting

aksiksi · Dec 2, 2023 · da717b5 · da717b5
1 parent afbfd8d
commit da717b5
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -206,6 +206,7 @@ If a feature is missing, please feel free to [create an issue](https://github.co
 | [`shm_size`](https://docs.docker.com/compose/compose-file/05-services/#shm_size) | ✅ |
 | [`runtime`](https://docs.docker.com/compose/compose-file/05-services/#runtime) | ✅ |
 | [`security_opt`](https://docs.docker.com/compose/compose-file/05-services/#security_opt) | ✅ |
+| [`command`](https://docs.docker.com/compose/compose-file/05-services/#command) | ✅ |
 
 #### [`networks`](https://docs.docker.com/compose/compose-file/06-networks/)
 

diff --git a/compose.go b/compose.go
@@ -228,6 +228,7 @@ func (g *Generator) buildNixContainer(service types.ServiceConfig) (*NixContaine
 		Volumes:       make(map[string]string),
 		SystemdConfig: systemdConfig,
 		LogDriver:     "journald", // This is the NixOS default
+		Command:       service.Command,
 	}
 
 	if g.IncludeEnvFiles {

diff --git a/nix.go b/nix.go
@@ -117,6 +117,7 @@ type NixContainer struct {
 	ExtraOptions  []string
 	SystemdConfig *NixContainerSystemdConfig
 	User          string
+	Command       []string
 }
 
 func (c *NixContainer) Unit() string {

diff --git a/templates/container.nix.tmpl b/templates/container.nix.tmpl
@@ -33,6 +33,10 @@ virtualisation.oci-containers.containers."{{.Name}}" = {
   ];
   {{- end}}
 
+  {{- if .Command}}
+  cmd = [{{range .Command}} "{{.}}" {{end}}];
+  {{- end}}
+
   {{- if .Labels}}
   labels = {
     {{- range $k, $v := .Labels}}

diff --git a/testdata/TestDocker_EnvFilesOnly_out.nix b/testdata/TestDocker_EnvFilesOnly_out.nix
@@ -18,6 +18,7 @@
       "/var/volumes/jellyseerr:/app/config:rw"
       "books:/books:rw"
     ];
+    cmd = [ "ls"  "-la"  "/" ];
     labels = {
       "traefik.enable" = "true";
       "traefik.http.routers.jellyseerr.middlewares" = "chain-authelia@file";

diff --git a/testdata/TestDocker_RemoveVolumes_out.nix b/testdata/TestDocker_RemoveVolumes_out.nix
@@ -20,6 +20,7 @@
       "/var/volumes/jellyseerr:/app/config:rw"
       "books:/books:rw"
     ];
+    cmd = [ "ls"  "-la"  "/" ];
     labels = {
       "traefik.enable" = "true";
       "traefik.http.routers.jellyseerr.middlewares" = "chain-authelia@file";

diff --git a/testdata/TestDocker_SystemdMount_out.nix b/testdata/TestDocker_SystemdMount_out.nix
@@ -20,6 +20,7 @@
       "/var/volumes/jellyseerr:/app/config:rw"
       "books:/books:rw"
     ];
+    cmd = [ "ls"  "-la"  "/" ];
     labels = {
       "traefik.enable" = "true";
       "traefik.http.routers.jellyseerr.middlewares" = "chain-authelia@file";

diff --git a/testdata/TestDocker_WithProject_out.nix b/testdata/TestDocker_WithProject_out.nix
@@ -20,6 +20,7 @@
       "/var/volumes/jellyseerr:/app/config:rw"
       "books:/books:rw"
     ];
+    cmd = [ "ls"  "-la"  "/" ];
     labels = {
       "traefik.enable" = "true";
       "traefik.http.routers.jellyseerr.middlewares" = "chain-authelia@file";

diff --git a/testdata/TestDocker_out.nix b/testdata/TestDocker_out.nix
@@ -20,6 +20,7 @@
       "/var/volumes/jellyseerr:/app/config:rw"
       "books:/books:rw"
     ];
+    cmd = [ "ls"  "-la"  "/" ];
     labels = {
       "traefik.enable" = "true";
       "traefik.http.routers.jellyseerr.middlewares" = "chain-authelia@file";

diff --git a/testdata/TestPodman_WithProject_out.nix b/testdata/TestPodman_WithProject_out.nix
@@ -25,6 +25,7 @@
       "/mnt/media/Books:/books:rw"
       "/var/volumes/jellyseerr:/app/config:rw"
     ];
+    cmd = [ "ls"  "-la"  "/" ];
     labels = {
       "traefik.enable" = "true";
       "traefik.http.routers.jellyseerr.middlewares" = "chain-authelia@file";

diff --git a/testdata/TestPodman_out.nix b/testdata/TestPodman_out.nix
@@ -25,6 +25,7 @@
       "/mnt/media/Books:/books:rw"
       "/var/volumes/jellyseerr:/app/config:rw"
     ];
+    cmd = [ "ls"  "-la"  "/" ];
     labels = {
       "traefik.enable" = "true";
       "traefik.http.routers.jellyseerr.middlewares" = "chain-authelia@file";

diff --git a/testdata/docker-compose.yml b/testdata/docker-compose.yml
@@ -121,6 +121,7 @@ services:
         max-size: 10m
         max-file: "3"
         compress: "true"
+    command: ls -la /
     restart: unless-stopped
   photoprism-mariadb:
     image: docker.io/library/mariadb:10.9