diff --git a/Cargo.toml b/Cargo.toml index cab6370..fe6a2a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,7 @@ edition = "2024" [dependencies] chrono = { version = "0.4.43", features = ["serde", "unstable-locales"] } +# Remember to update the CLI as well. dioxus = { version = "0.7.3", features = ["fullstack", "router"] } # TODO: Remove this once https://github.com/DioxusLabs/dioxus/issues/4765 is resolved. dioxus-html = { version = "0.7.3", features = ["serialize"] } @@ -19,6 +20,7 @@ tracing = "0.1.44" unic-langid-impl = { version = "0.9.6", features = ["serde"] } validator = { version = "0.20.0", features = ["derive"] } +# Remember to update the CLI as well. diesel = { version = "2.3.6", features = [ "chrono", "postgres", diff --git a/docker-compose-prod.yaml b/docker-compose-prod.yaml index 3212904..796b493 100755 --- a/docker-compose-prod.yaml +++ b/docker-compose-prod.yaml @@ -6,6 +6,7 @@ services: networks: - default - web-server-network + ports: ["8000:80"] restart: always depends_on: ["db"] diff --git a/docker/dev/app/Dockerfile b/docker/dev/app/Dockerfile index 133e8b9..88de651 100644 --- a/docker/dev/app/Dockerfile +++ b/docker/dev/app/Dockerfile @@ -5,8 +5,8 @@ RUN useradd -m -u 1000 -s /bin/bash app_user \ USER app_user -RUN cargo install --git https://github.com/diesel-rs/diesel --rev 2e85ba060d3d70ea605ea58a79b8a435749a7adc --locked diesel_cli \ - && cargo install --git https://github.com/DioxusLabs/dioxus --rev 8f8b58ea80ba0ec8057807bcd58fb609f7a5f2b1 --locked dioxus-cli +RUN cargo install --git https://github.com/diesel-rs/diesel --rev 207604888d28a490061698f07a25090438be42fe --locked diesel_cli \ + && cargo install --git https://github.com/DioxusLabs/dioxus --rev 22b06badde44ba1af0fcf339c91b66483175b660 --locked dioxus-cli COPY --chown=app_user . /srv/app WORKDIR /srv/app diff --git a/docker/prod/app/Dockerfile b/docker/prod/app/Dockerfile index f480346..0bac101 100644 --- a/docker/prod/app/Dockerfile +++ b/docker/prod/app/Dockerfile @@ -1,7 +1,7 @@ FROM rust:1.92.0-bookworm@sha256:9676d0547a259997add8f5924eb6b959c589ed39055338e23b99aba7958d6d31 AS builder_base -RUN cargo install --git https://github.com/diesel-rs/diesel --rev 2e85ba060d3d70ea605ea58a79b8a435749a7adc --locked diesel_cli \ - && cargo install --git https://github.com/DioxusLabs/dioxus --rev 8f8b58ea80ba0ec8057807bcd58fb609f7a5f2b1 --locked dioxus-cli --features disable-telemetry +RUN cargo install --git https://github.com/diesel-rs/diesel --rev 207604888d28a490061698f07a25090438be42fe --locked diesel_cli \ + && cargo install --git https://github.com/DioxusLabs/dioxus --rev 22b06badde44ba1af0fcf339c91b66483175b660 --locked dioxus-cli --features disable-telemetry COPY . /srv/app WORKDIR /srv/app