temp

.dockerignore

@@ -5,5 +5,8 @@
 /node_modules/
 /static/
 /target/
-/docker-compose-dev.yaml
-/docker-compose-prod.yaml
+.dockerignore
+/docker-compose-dev.yml
+/docker-compose-prod.yml
+/docker/dev/app/Dockerfile
+/docker/prod/app/Dockerfile

.env.dev

@@ -1,2 +1,2 @@
-DATABASE_URL=postgres://app:app@db/todo_baggins
+DATABASE_URL=postgres://app:app@localhost:5432/todo_baggins
 LANGUAGE_CODE=en-US

Cargo.lock

@@ -3677,6 +3677,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "openssl-src"
+version = "300.4.1+3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.104"
@@ -3685,6 +3694,7 @@ checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -5133,6 +5143,7 @@ dependencies = [
  "dioxus-query",
  "dotenvy",
  "feruca",
+ "openssl",
  "serde",
  "serde_json",
  "serde_with",

Cargo.toml

@@ -22,21 +22,22 @@ diesel_migrations = { version = "2.2.0", features = ["postgres"], optional = tru
 dotenvy = { version = "0.15.7", optional = true }
 time = { version = "0.3.36", optional = true }
 
-async-std = { version = "1.12.0", optional = true }
-dioxus-i18n = { version = "0.3.0", optional = true }
-dioxus-query = { version = "0.6.0", optional = true }
-voca_rs = { version = "1.15.2", optional = true }
+async-std = { version = "1.12.0" }
+dioxus-i18n = { version = "0.3.0" }
+dioxus-query = { version = "0.6.0" }
+voca_rs = { version = "1.15.2" }
+
+[target.'cfg(target_os = "android")'.dependencies]
+openssl = { version = "0.10", features = ["vendored"] }
 
 [features]
-default = ["web"]
+default = ["mobile"]
 desktop = ["dioxus/desktop"]
-mobile = ["dioxus/mobile"]
+mobile = [
+    "dioxus/mobile",
+]
 web = [
     "dioxus/web",
-    "dep:async-std",
-    "dep:dioxus-query",
-    "dep:dioxus-i18n",
-    "dep:voca_rs"
 ]
 server = [
     "dioxus/server",

docker/dev/app/supervisord.conf

@@ -13,11 +13,11 @@ stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 redirect_stderr=true
 
-[program:dx]
-command=dx serve --addr 0.0.0.0 --port 8000
-directory=/srv/app
-autostart=true
-autorestart=true
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
+# [program:dx]
+# command=dx serve --addr 0.0.0.0 --port 8000
+# directory=/srv/app
+# autostart=true
+# autorestart=true
+# stdout_logfile=/dev/fd/1
+# stdout_logfile_maxbytes=0
+# redirect_stderr=true

docker/prod/app/Dockerfile

@@ -1,11 +1,9 @@
 FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b AS builder
 
-RUN rustup target add wasm32-unknown-unknown \
- && cargo install dioxus-cli diesel_cli \
+RUN cargo install dioxus-cli diesel_cli \
  && apt-get update && apt-get install -y --no-install-recommends \
     nodejs=18.19.0+dfsg-6~deb12u2 \
     npm=9.2.0~ds1-1 \
-    supervisor=4.2.5-1 \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*