merge: #2666

2666: fix(si): Ensure that we mount the SI data_dir with the correct mount options r=stack72 a=stack72 Co-authored-by: stack72 <[email protected]>
systeminit · Aug 21, 2023 · 5d9ee7c · 5d9ee7c
2 parents bdd0b69 + 138093b
commit 5d9ee7c
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/si-cli/src/cmd/start.rs b/lib/si-cli/src/cmd/start.rs
@@ -281,7 +281,7 @@ async fn invoke(app: &AppState, docker: &DockerClient, is_preview: bool) -> CliR
                 .image(format!("{0}:stable", container.clone()))
                 .links(vec!["local-nats-1:nats", "local-otelcol-1:otelcol"])
                 .env(env_vars)
-                .volumes([format!("{}:/run/cyclone", si_data_dir.display())])
+                .volumes([format!("{}:/run/cyclone:z", si_data_dir.display())])
                 .build();
 
             let container = docker.containers().create(&create_opts).await?;
@@ -331,7 +331,7 @@ async fn invoke(app: &AppState, docker: &DockerClient, is_preview: bool) -> CliR
                     "SI_PINGA__PG__HOSTNAME=postgres",
                     "OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317",
                 ])
-                .volumes([format!("{}:/run/pinga", si_data_dir.display())])
+                .volumes([format!("{}:/run/pinga:z", si_data_dir.display())])
                 .build();
 
             let container = docker.containers().create(&create_opts).await?;
@@ -384,11 +384,11 @@ async fn invoke(app: &AppState, docker: &DockerClient, is_preview: bool) -> CliR
                 .expose(PublishPort::tcp(5156), HostPort::new(5156))
                 .volumes([
                     format!(
-                        "{}:/run/sdf/cyclone_encryption.key:Z",
+                        "{}:/run/sdf/cyclone_encryption.key:z",
                         si_data_dir.join("cyclone_encryption.key").display()
                     ),
                     format!(
-                        "{}:/run/sdf/jwt_signing_public_key.pem:Z",
+                        "{}:/run/sdf/jwt_signing_public_key.pem:z",
                         si_data_dir.join("jwt_signing_public_key.pem").display()
                     ),
                 ])