From 0e2704fad2da38808bfea72c54a91469cdf51fb3 Mon Sep 17 00:00:00 2001 From: Sam Sartor Date: Thu, 27 Nov 2025 22:40:48 -0700 Subject: [PATCH] update to 0.7.1 in readme & cleanup unused files --- README.md | 6 +++--- bin/build-release.sh | 27 --------------------------- bin/release.sh | 20 -------------------- docker/dioxus.Dockerfile | 22 ---------------------- docker/docker-compose.yaml | 2 -- docker/release-builder.Dockerfile | 6 ------ 6 files changed, 3 insertions(+), 80 deletions(-) delete mode 100755 bin/build-release.sh delete mode 100755 bin/release.sh delete mode 100644 docker/dioxus.Dockerfile delete mode 100644 docker/release-builder.Dockerfile diff --git a/README.md b/README.md index e36b8c4..d22926e 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ ## Running Desktop -1. `cargo install dioxus-cli --version 0.6.3` +1. `cargo install dioxus-cli --version 0.7.1` 2. `dx run -p mumble-web2-gui --platform desktop --release` ## Running Web (development) -1. `cargo install dioxus-cli --version 0.6.3` +1. `cargo install dioxus-cli --version 0.7.1` 3. `dx serve -p mumble-web2-gui --platform web` 2. `cd docker && docker compose up` 4. connect to `https://localhost:64444` @@ -16,7 +16,7 @@ ## Running Web (with `proxy` only) -1. `cargo install dioxus-cli --version 0.6.3` +1. `cargo install dioxus-cli --version 0.7.1` 2. `dx build -p mumble-web2-gui --platform web --release` 3. `cp config.toml.example config.toml` 4. `cargo run -p mumble-web2-proxy` in the background diff --git a/bin/build-release.sh b/bin/build-release.sh deleted file mode 100755 index 636165b..0000000 --- a/bin/build-release.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -set -e - -# Install the Dioxus CLI -#cargo install dioxus-cli --version 0.7.1 - -# Build the Dioxus web app (assumes workspace subproject at ./gui) -cd gui -dx build --platform web --release -cd .. - -# Build the backend (proxy package) -#cargo build --release -p proxy -# -## Prepare artifact directories -#mkdir -p artifacts -# -## Copy Dioxus webroot (usually at gui/dist) -#cp -r gui/dist artifacts/webroot -# -## Copy backend binary (proxy) -## Finds the built binary under target/release/ -#PROXY_PATH=$(cargo metadata --format-version=1 --no-deps | -# jq -r '.packages[] | select(.name=="proxy") | .targets[] | select(.kind[] == "bin") | .name') -#cp "target/release/$PROXY_PATH" "artifacts/proxy" -# -#echo "Artifacts have been prepared at ./artifacts" diff --git a/bin/release.sh b/bin/release.sh deleted file mode 100755 index 47f201d..0000000 --- a/bin/release.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -set -e - -mkdir -p ./cargo-tmp -mkdir -p ./docker-target - -rm -rf ./docker-tmp -mkdir ./docker-tmp -rsync -av --exclude-from=.gitignore --exclude .git/ --exclude docker-tmp/ --exclude cargo-tmp/ --exclude docker-target/ ./ ./docker-tmp/ - -docker build -f ./docker/release-builder.Dockerfile -t mumbleweb2-builder:latest . - -docker run -it --rm \ - -v "$(pwd)/docker-tmp":/work \ - -v "$(pwd)/docker-target":/work/target \ - -v "$(pwd)/cargo-tmp/registry":/usr/local/cargo/registry \ - -v "$(pwd)/cargo-tmp/git":/usr/local/cargo/git \ - -w /work \ - mumbleweb2-builder:latest /bin/bash ./bin/build-release.sh diff --git a/docker/dioxus.Dockerfile b/docker/dioxus.Dockerfile deleted file mode 100644 index dfc4158..0000000 --- a/docker/dioxus.Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM rust:1-bookworm AS base - -# Install cargo-binstall for faster CLI installation -#RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash - -RUN apt-get update && apt-get install -y screen - -# Install dioxus-cli version 0.6.3 specifically -RUN cargo install dioxus-cli --version 0.6.3 - -# Set working directory -WORKDIR /app - -# Add wasm32 target for web development -RUN rustup target add wasm32-unknown-unknown - -# Set environment variables -ENV PATH="/root/.cargo/bin:$PATH" - -# Default command (can be overridden in docker-compose) -CMD ["dx", "--help"] - diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 373bbbb..83b2574 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -48,8 +48,6 @@ services: ports: - "64738:64738/tcp" - "64738:64738/udp" - environment: - - MUMBLE_CONFIG_WELCOMETEXT=Welcome to the Mumble server network_mode: host #volumes: # caddy_data: diff --git a/docker/release-builder.Dockerfile b/docker/release-builder.Dockerfile deleted file mode 100644 index 2d4447c..0000000 --- a/docker/release-builder.Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -#FROM rust:latest -FROM rust:1.90.0-trixie - -RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash - -RUN cargo binstall dioxus-cli --version 0.6.3