chore(release): version v0.23.0

chore: remove aarch64-linux-android platform
ci: support more platforms (#76 )
2026-04-09 09:09:03 +03:00 · 2022-06-29 11:01:40 +08:00 · 2022-06-29 10:58:43 +08:00 · 2022-06-29 10:51:59 +08:00 · 2022-06-29 10:01:01 +08:00 · 2022-06-29 09:19:09 +08:00
7 changed files with 144 additions and 95 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -7,33 +7,67 @@ on:

 jobs:
  release:
-    name: Publish to Github Reelases
+    name: Publish to Github Relases
    outputs:
      rc: ${{ steps.check-tag.outputs.rc }}

    strategy:
      matrix:
-        target:
-        - aarch64-unknown-linux-musl
-        - aarch64-apple-darwin
-        - x86_64-apple-darwin
-        - x86_64-pc-windows-msvc
-        - x86_64-unknown-linux-musl
        include:
        - target: aarch64-unknown-linux-musl
          os: ubuntu-latest
          use-cross: true
+          cargo-flags: ""
        - target: aarch64-apple-darwin
          os: macos-latest
          use-cross: true
+          cargo-flags: ""
+        - target: aarch64-pc-windows-msvc
+          os: windows-latest
+          use-cross: true
+          cargo-flags: "--no-default-features"
        - target: x86_64-apple-darwin
          os: macos-latest
+          cargo-flags: ""
        - target: x86_64-pc-windows-msvc
          os: windows-latest
+          cargo-flags: ""
        - target: x86_64-unknown-linux-musl
          os: ubuntu-latest
          use-cross: true
-
+          cargo-flags: ""
+        - target: i686-unknown-linux-musl
+          os: ubuntu-latest
+          use-cross: true
+          cargo-flags: ""
+        - target: i686-pc-windows-msvc
+          os: windows-latest
+          use-cross: true
+          cargo-flags: ""
+        - target: armv7-unknown-linux-musleabihf
+          os: ubuntu-latest
+          use-cross: true
+          cargo-flags: ""
+        - target: arm-unknown-linux-musleabihf
+          os: ubuntu-latest
+          use-cross: true
+          cargo-flags: ""
+        - target: mips-unknown-linux-musl
+          os: ubuntu-latest
+          use-cross: true
+          cargo-flags: "--no-default-features"
+        - target: mipsel-unknown-linux-musl
+          os: ubuntu-latest
+          use-cross: true
+          cargo-flags: "--no-default-features"
+        - target: mips64-unknown-linux-gnuabi64
+          os: ubuntu-latest
+          use-cross: true
+          cargo-flags: "--no-default-features"
+        - target: mips64el-unknown-linux-gnuabi64
+          os: ubuntu-latest
+          use-cross: true
+          cargo-flags: "--no-default-features"
    runs-on: ${{matrix.os}}

    steps:
@@ -59,14 +93,7 @@ jobs:
        target: ${{ matrix.target }}
        toolchain: stable
        profile: minimal # minimal component installation (ie, no documentation)
-
-    - name: Install prerequisites
-      shell: bash
-      run: |
-        case ${{ matrix.target }} in
-          aarch64-unknown-linux-musl) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
-        esac
-
+  
    - name: Show Version Information (Rust, cargo, GCC)
      shell: bash
      run: |
@@ -82,7 +109,7 @@ jobs:
      with:
        use-cross: ${{ matrix.use-cross }}
        command: build
-        args: --locked --release --target=${{ matrix.target }}
+        args: --locked --release --target=${{ matrix.target }} ${{ matrix.cargo-flags }}

    - name: Build Archive
      shell: bash
@@ -133,6 +160,8 @@ jobs:
    runs-on: ubuntu-latest
    needs: release
    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v1
      - name: Login to DockerHub
@@ -141,9 +170,16 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      - name: Build and push
-        id: docker_build
        uses: docker/build-push-action@v2
        with:
+          build-args: |
+            REPO=${{ github.repository }}
+            VER=${{ github.ref_name }}
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/386
+            linux/arm/v7
          push: ${{ needs.release.outputs.rc == 'false' }}
          tags: ${{ github.repository }}:latest, ${{ github.repository }}:${{ github.ref_name }}
          
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,17 @@

 All notable changes to this project will be documented in this file.

-## [0.22.0] - 2022-06-25
+## [0.23.0] - 2022-06-29
+
+### Features
+
+- Use feature to conditional support tls ([#77](https://github.com/sigoden/dufs/issues/77))
+
+### Ci
+
+- Support more platforms ([#76](https://github.com/sigoden/dufs/issues/76))
+
+## [0.22.0] - 2022-06-26

 ### Features

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,7 +23,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -148,7 +148,7 @@ dependencies = [
 "slab",
 "socket2",
 "waker-fn",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -374,12 +374,6 @@ dependencies = [
 "pkg-config",
 ]

-[[package]]
-name = "c_linked_list"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b"
-
 [[package]]
 name = "cache-padded"
 version = "1.2.0"
@@ -411,7 +405,7 @@ dependencies = [
 "num-integer",
 "num-traits",
 "time",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -572,7 +566,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"

 [[package]]
 name = "dufs"
-version = "0.22.0"
+version = "0.23.0"
 dependencies = [
 "assert_cmd",
 "assert_fs",
@@ -584,9 +578,9 @@ dependencies = [
 "clap",
 "diqwest",
 "futures",
- "get_if_addrs",
 "headers",
 "hyper",
+ "if-addrs",
 "lazy_static",
 "log",
 "md5",
@@ -813,12 +807,6 @@ dependencies = [
 "slab",
 ]

-[[package]]
-name = "gcc"
-version = "0.3.55"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-
 [[package]]
 name = "generic-array"
 version = "0.14.5"
@@ -829,28 +817,6 @@ dependencies = [
 "version_check",
 ]

-[[package]]
-name = "get_if_addrs"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7"
-dependencies = [
- "c_linked_list",
- "get_if_addrs-sys",
- "libc",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "get_if_addrs-sys"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48"
-dependencies = [
- "gcc",
- "libc",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.1.16"
@@ -1083,6 +1049,16 @@ dependencies = [
 "unicode-normalization",
 ]

+[[package]]
+name = "if-addrs"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "ignore"
 version = "0.4.18"
@@ -1437,7 +1413,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -1560,7 +1536,7 @@ dependencies = [
 "libc",
 "log",
 "wepoll-ffi",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -1760,7 +1736,7 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -1818,7 +1794,7 @@ dependencies = [
 "spin",
 "untrusted",
 "web-sys",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -2059,7 +2035,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
 dependencies = [
 "libc",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -2116,7 +2092,7 @@ dependencies = [
 "libc",
 "redox_syscall",
 "remove_dir_all",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -2137,7 +2113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
 dependencies = [
 "libc",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -2192,7 +2168,7 @@ checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
 dependencies = [
 "libc",
 "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -2226,7 +2202,7 @@ dependencies = [
 "signal-hook-registry",
 "socket2",
 "tokio-macros",
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -2427,7 +2403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
 dependencies = [
 "same-file",
- "winapi 0.3.9",
+ "winapi",
 "winapi-util",
 ]

@@ -2563,12 +2539,6 @@ dependencies = [
 "cc",
 ]

-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -2591,7 +2561,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
@@ -2649,7 +2619,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dufs"
-version = "0.22.0"
+version = "0.23.0"
 edition = "2021"
 authors = ["sigoden <sigoden@gmail.com>"]
 description = "Dufs is a distinctive utility file server"
@@ -14,7 +14,6 @@ keywords = ["static", "file", "server", "webdav", "cli"]
 clap = { version = "3", default-features = false, features = ["std", "wrap_help"] }
 chrono = "0.4"
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "fs", "io-util", "signal"]}
-tokio-rustls = "0.23"
 tokio-util = { version = "0.7",  features = ["io-util"] }
 hyper = { version = "0.14", features = ["http1", "server", "tcp", "stream"] }
 percent-encoding = "2.1"
@@ -26,9 +25,10 @@ async_zip = "0.0.7"
 async-walkdir = "0.2"
 headers = "0.3"
 mime_guess = "2.0"
-get_if_addrs = "0.5"
-rustls = { version = "0.20", default-features = false, features = ["tls12"] }
-rustls-pemfile = "1"
+if-addrs = "0.7"
+rustls = { version = "0.20", default-features = false, features = ["tls12"], optional = true }
+rustls-pemfile = { version = "1", optional = true }
+tokio-rustls = { version = "0.23", optional = true }
 md5 = "0.7"
 lazy_static = "1.4"
 uuid = { version = "1.1", features = ["v4", "fast-rng"] }
@@ -38,6 +38,10 @@ log = "0.4"
 socket2 = "0.4"
 async-stream = "0.3"

+[features]
+default = ["tls"]
+tls = ["rustls", "rustls-pemfile", "tokio-rustls"]
+
 [dev-dependencies]
 assert_cmd = "2"
 reqwest = { version = "0.11", features = ["blocking", "multipart", "rustls-tls"], default-features = false }
--- a/24
+++ b/24
@@ -1,10 +1,18 @@
-FROM rust:1.61 as builder
-RUN rustup target add x86_64-unknown-linux-musl
-RUN apt-get update && apt-get install --no-install-recommends -y musl-tools
-WORKDIR /app
-COPY . .
-RUN cargo build --target x86_64-unknown-linux-musl --release
+FROM alpine as builder
+ARG REPO VER TARGETPLATFORM
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ 
+        TARGET="x86_64-unknown-linux-musl"; \
+    elif [  "$TARGETPLATFORM" = "linux/arm64" ]; then \
+        TARGET="aarch64-unknown-linux-musl"; \
+    elif [  "$TARGETPLATFORM" = "linux/386" ]; then \
+        TARGET="i686-unknown-linux-musl"; \
+    elif [  "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
+        TARGET="armv7-unknown-linux-musleabihf"; \
+    fi && \
+    wget https://github.com/${REPO}/releases/download/${VER}/dufs-${VER}-${TARGET}.tar.gz && \
+    tar -xf dufs-${VER}-${TARGET}.tar.gz && \
+    mv dufs /bin/

 FROM scratch
-COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/dufs /bin/
-ENTRYPOINT ["/bin/dufs"]
+COPY --from=builder /bin/dufs /bin/dufs
+ENTRYPOINT ["/bin/dufs"]
--- a/src/args.rs
+++ b/src/args.rs
@@ -1,4 +1,5 @@
 use clap::{AppSettings, Arg, ArgMatches, Command};
+#[cfg(feature = "tls")]
 use rustls::{Certificate, PrivateKey};
 use std::env;
 use std::net::IpAddr;
@@ -6,11 +7,12 @@ use std::path::{Path, PathBuf};

 use crate::auth::AccessControl;
 use crate::auth::AuthMethod;
+#[cfg(feature = "tls")]
 use crate::tls::{load_certs, load_private_key};
 use crate::BoxResult;

 fn app() -> Command<'static> {
-    Command::new(env!("CARGO_CRATE_NAME"))
+    let app = Command::new(env!("CARGO_CRATE_NAME"))
        .version(env!("CARGO_PKG_VERSION"))
        .author(env!("CARGO_PKG_AUTHORS"))
        .about(concat!(
@@ -116,7 +118,10 @@ fn app() -> Command<'static> {
            Arg::new("render-spa")
                .long("render-spa")
                .help("Serve SPA(Single Page Application)"),
-        )
+        );
+
+    #[cfg(feature = "tls")]
+    let app = app
        .arg(
            Arg::new("tls-cert")
                .long("tls-cert")
@@ -128,7 +133,9 @@ fn app() -> Command<'static> {
                .long("tls-key")
                .value_name("path")
                .help("Path to the SSL/TLS certificate's private key"),
-        )
+        );
+
+    app
 }

 pub fn matches() -> ArgMatches {
@@ -154,7 +161,10 @@ pub struct Args {
    pub render_spa: bool,
    pub render_try_index: bool,
    pub enable_cors: bool,
+    #[cfg(feature = "tls")]
    pub tls: Option<(Vec<Certificate>, PrivateKey)>,
+    #[cfg(not(feature = "tls"))]
+    pub tls: Option<()>,
 }

 impl Args {
@@ -201,6 +211,7 @@ impl Args {
        let render_index = matches.is_present("render-index");
        let render_try_index = matches.is_present("render-try-index");
        let render_spa = matches.is_present("render-spa");
+        #[cfg(feature = "tls")]
        let tls = match (matches.value_of("tls-cert"), matches.value_of("tls-key")) {
            (Some(certs_file), Some(key_file)) => {
                let certs = load_certs(certs_file)?;
@@ -209,6 +220,8 @@ impl Args {
            }
            _ => None,
        };
+        #[cfg(not(feature = "tls"))]
+        let tls = None;

        Ok(Args {
            addrs,
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,6 +3,7 @@ mod auth;
 mod logger;
 mod server;
 mod streamer;
+#[cfg(feature = "tls")]
 mod tls;
 mod utils;

@@ -11,6 +12,7 @@ extern crate log;

 use crate::args::{matches, Args};
 use crate::server::{Request, Server};
+#[cfg(feature = "tls")]
 use crate::tls::{TlsAcceptor, TlsStream};

 use std::net::{IpAddr, SocketAddr, TcpListener as StdTcpListener};
@@ -22,6 +24,7 @@ use tokio::task::JoinHandle;

 use hyper::server::conn::{AddrIncoming, AddrStream};
 use hyper::service::{make_service_fn, service_fn};
+#[cfg(feature = "tls")]
 use rustls::ServerConfig;

 pub type BoxResult<T> = Result<T, Box<dyn std::error::Error>>;
@@ -70,12 +73,13 @@ fn serve(args: Arc<Args>) -> BoxResult<Vec<JoinHandle<Result<(), hyper::Error>>>
                }))
            }
        };
-        match args.tls.clone() {
+        match args.tls.as_ref() {
+            #[cfg(feature = "tls")]
            Some((certs, key)) => {
                let config = ServerConfig::builder()
                    .with_safe_defaults()
                    .with_no_client_auth()
-                    .with_single_cert(certs, key)?;
+                    .with_single_cert(certs.clone(), key.clone())?;
                let config = Arc::new(config);
                let accepter = TlsAcceptor::new(config.clone(), incoming);
                let new_service = make_service_fn(move |socket: &TlsStream| {
@@ -85,6 +89,10 @@ fn serve(args: Arc<Args>) -> BoxResult<Vec<JoinHandle<Result<(), hyper::Error>>>
                let server = tokio::spawn(hyper::Server::builder(accepter).serve(new_service));
                handles.push(server);
            }
+            #[cfg(not(feature = "tls"))]
+            Some(_) => {
+                unreachable!()
+            }
            None => {
                let new_service = make_service_fn(move |socket: &AddrStream| {
                    let remote_addr = socket.remote_addr();
@@ -128,7 +136,7 @@ fn print_listening(args: Arc<Args>) -> BoxResult<()> {
        }
    }
    if ipv4 || ipv6 {
-        let ifaces = get_if_addrs::get_if_addrs()
+        let ifaces = if_addrs::get_if_addrs()
            .map_err(|e| format!("Failed to get local interface addresses: {}", e))?;
        for iface in ifaces.into_iter() {
            let local_ip = iface.ip();
Author	SHA1	Message	Date
sigoden	3ed0d885fe	chore(release): version v0.23.0	2022-06-29 11:01:40 +08:00
sigoden	542e9a4ec5	chore: remove aarch64-linux-android platform	2022-06-29 10:58:43 +08:00
sigoden	5ee2c5504c	ci: support more platforms (#76 )	2022-06-29 10:51:59 +08:00
sigoden	fd02a53823	chore: replace old get-if-addrs with new if-addrs (#78 )	2022-06-29 10:01:01 +08:00
sigoden	6554c1c308	feat: use feature to conditional support tls (#77 )	2022-06-29 09:19:09 +08:00