feat: why not working

Author: KrLite

src/endpoint/internal/update/mod.rs

@@ -36,23 +36,24 @@ pub async fn post(Json(payload): Json<PostPayload>) -> impl IntoResponse {
     StatusCode::OK
 }
 
-async fn post_transaction(cx: QueuedAsyncFrameworkContext, payload: PostPayload) -> State<()> {
+async fn post_transaction(cx: QueuedAsyncFrameworkContext, _payload: PostPayload) -> State<()> {
     unwrap!(cx.check());
 
-    match transactions::docker::pull_image(&payload.image).await {
+    match transactions::docker::compose_up(&DOCKER_CONTAINER_NAME).await {
         Ok(_) => {}
         Err(e) => {
-            tracing::error!("failed to update: {e:?}");
+            tracing::error!("failed to update {}: {e:?}", &*DOCKER_CONTAINER_NAME);
             return State::Retry;
         }
     }
 
-    unwrap!(cx.check());
-
-    match transactions::docker::compose_up(&DOCKER_CONTAINER_NAME).await {
+    match transactions::nginx::reload().await {
         Ok(_) => {}
         Err(e) => {
-            tracing::error!("failed to update {}: {e:?}", &*DOCKER_CONTAINER_NAME);
+            tracing::error!(
+                "failed to reload nginx after updating {}: {e:?}",
+                &*DOCKER_CONTAINER_NAME
+            );
             return State::Retry;
         }
     }

src/endpoint/internal/website/deploy/mod.rs

@@ -97,16 +97,6 @@ pub async fn post(Json(payload): Json<PostPayload>) -> impl IntoResponse {
 async fn post_transaction(cx: QueuedAsyncFrameworkContext, payload: PostPayload) -> State<()> {
     unwrap!(cx.check());
 
-    match transactions::docker::pull_image(&payload.image).await {
-        Ok(_) => {}
-        Err(e) => {
-            tracing::error!("failed to deploy {}: {e:?}", &payload.target);
-            return State::Retry;
-        }
-    }
-
-    unwrap!(cx.check());
-
     match transactions::docker::compose_up(payload.target.to_string().as_str()).await {
         Ok(_) => {}
         Err(e) => {

src/env.rs

@@ -48,6 +48,11 @@ static_lazy_lock! {
     pub DOCKER_CONTAINER_NAME: String = env::var("DOCKER_CONTAINER_NAME").unwrap_or_else(|_| format!("api-{}", clap::crate_name!()));
 }
 
+static_lazy_lock! {
+    /// The name of the Docker container that runs Nginx.
+    pub DOCKER_CONTAINER_NAME_NGINX: String = env::var("DOCKER_CONTAINER_NAME_NGINX").unwrap_or_else(|_| "nginx".into());
+}
+
 static_lazy_lock! {
     /// The path to the Docker Compose file.
     pub DOCKER_COMPOSE_FILE: PathBuf = parse_env!("DOCKER_COMPOSE_FILE" => |s| Ok(PathBuf::from(s))).unwrap();

src/transactions/docker.rs

@@ -2,24 +2,6 @@ use anyhow::Result;
 
 use crate::env::DOCKER_COMPOSE_FILE;
 
-pub async fn pull_image(image: &str) -> Result<()> {
-    match tokio::process::Command::new("docker")
-        .arg("pull")
-        .arg(image)
-        .output()
-        .await
-    {
-        Ok(_) => {
-            tracing::info!("successfully pulled image {}", image);
-            Ok(())
-        }
-        Err(e) => {
-            tracing::error!("failed to pull image {}: {e:?}", image);
-            Err(anyhow::anyhow!("failed to pull image"))
-        }
-    }
-}
-
 pub async fn compose_up(container_name: &str) -> Result<()> {
     match tokio::process::Command::new("docker")
         .arg("compose")
@@ -28,6 +10,8 @@ pub async fn compose_up(container_name: &str) -> Result<()> {
         .arg("up")
         .arg("-d")
         .arg(container_name)
+        .arg("--pull")
+        .arg("always")
         .arg("--force-recreate")
         .output()
         .await

src/transactions/mod.rs

@@ -1 +1,2 @@
 pub mod docker;
+pub mod nginx;

src/transactions/nginx.rs

@@ -0,0 +1,22 @@
+use crate::env::DOCKER_CONTAINER_NAME_NGINX;
+
+pub async fn reload() -> anyhow::Result<()> {
+    match tokio::process::Command::new("docker")
+        .arg("exec")
+        .arg(&*DOCKER_CONTAINER_NAME_NGINX)
+        .arg("nginx")
+        .arg("-s")
+        .arg("reload")
+        .output()
+        .await
+    {
+        Ok(_) => {
+            tracing::info!("successfully reloaded nginx");
+            Ok(())
+        }
+        Err(e) => {
+            tracing::error!("failed to reload nginx: {e:?}");
+            Err(anyhow::anyhow!("failed to reload nginx"))
+        }
+    }
+}