docker-compose.prod.yml

@@ -2,8 +2,8 @@ version: '3.7'
 services:
     filed:
         build:
-            context: .
+            context: filed
-            dockerfile: filed/Dockerfile.prod
+            dockerfile: Dockerfile.prod
         networks:
             bfile:
         volumes:

filed/Dockerfile.prod

@@ -2,17 +2,16 @@
 FROM rust:alpine as builder
 
 WORKDIR /opt/build
-COPY filed .
+COPY . .
-COPY ./.git ./.git
 
-RUN apk add --no-cache git musl-dev upx nodejs yarn && \
+RUN apk add --no-cache musl-dev upx nodejs yarn && \
-    yarn global add uglify-js@3.17.4
+    yarn global add uglify-js
 
 RUN cargo b -r
 RUN strip target/release/filed && upx --best target/release/filed
 
 # --- deploy ---
-FROM alpine:3.17
+FROM busybox:musl
 
 RUN mkdir /config
 WORKDIR /config

filed/build.rs

@@ -1,5 +1,5 @@
 
-use std::{fs, path::PathBuf, ffi::OsStr, process::Command, error::Error};
+use std::{fs, path::PathBuf, ffi::OsStr, process::Command};
 
 use css_minify::optimizations::{Minifier, Level};
 
@@ -17,17 +17,17 @@ fn extfilter(valid: String, x: Option<&OsStr>) -> bool {
     ext == valid
 }
 
-fn system(cmd: &str, args: &[&str]) -> Result<String, Box<dyn Error>> {
+fn system(cmd: &str, args: &[&str]) -> String {
     let out = Command::new(cmd)
         .args(args)
         .output()
-        ?;
+        .unwrap();
 
     if out.stderr.len() != 0 {
         panic!("Got this while running {cmd} with \"{}\": {}", args.join(" "), String::from_utf8(out.stderr).unwrap())
     }
 
-    Ok(String::from_utf8(out.stdout)?)
+    String::from_utf8(out.stdout).unwrap()
 }
 
 fn main() {
@@ -65,24 +65,17 @@ fn main() {
 
     scripts.iter().for_each(|asset| {
         Command::new("uglifyjs")
+            .arg("-c")
             .arg(asset)
             .arg("-o")
             .arg(asset_path(asset))
-            .arg("-c")
             .spawn()
             .unwrap();
     });
 
-    let commit = system("git", &["rev-parse", "HEAD"]).map_err(|x| x.to_string());
+    let commit = system("git", &["rev-parse", "HEAD"]);
-    let branch = system("git", &["rev-parse", "--abbrev-ref", "HEAD"]).map_err(|x| x.to_string());
+    let branch = system("git", &["rev-parse", "--abbrev-ref", "HEAD"]);
 
-    match commit {
+    println!("cargo:rustc-env=COMMIT_HASH={commit}");
-        Err(err) => panic!("Can't get commit: {}", err),
+    println!("cargo:rustc-env=COMMIT_BRANCH={branch}");
-        Ok(commit) => println!("cargo:rustc-env=COMMIT_HASH={commit}")
-    }
-
-    match branch {
-        Err(err) => panic!("Can't get commit: {}", err),
-        Ok(branch) => println!("cargo:rustc-env=COMMIT_BRANCH={branch}")
-    }
 }

janitor/Dockerfile.prod

@@ -10,7 +10,7 @@ RUN cargo b -r
 RUN strip target/release/janitor && upx --best target/release/janitor
 
 # --- deploy ---
-FROM alpipne:3.17
+FROM busybox:musl
 
 RUN mkdir /config
 WORKDIR /config