From 8f3d144329b115ff639298fb3834771683fa244f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matou=C5=A1=20Volf?= <git@matousvolf.cz>
Date: Wed, 29 Jan 2025 22:14:10 +0100
Subject: [PATCH] build: bump the Dockerfile dependencies

---
 Dioxus.toml                | 28 ++++++++++++++--------------
 docker/dev/app/Dockerfile  |  3 ++-
 docker/prod/app/Dockerfile | 11 +++++++----
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/Dioxus.toml b/Dioxus.toml
index 1749ea6..6a6451b 100644
--- a/Dioxus.toml
+++ b/Dioxus.toml
@@ -3,25 +3,25 @@
 # App (Project) Name
 name = "todo-baggins"
 
-# Dioxus App Default Platform
-# web, desktop, fullstack
-default_platform = "fullstack"
-
-# `build` & `serve` dist path
-out_dir = "dist"
-
-# resource (assets) file folder
+# For font files to get referenced in CSS files by their original names, without the hash Dioxus appends.
 asset_dir = "assets"
 
 [web.app]
 
 # HTML title tag content
-title = "Todo Baggins"
+title = "irismemories"
 
-[web.watcher]
+# include `assets` in web platform
+[web.resource]
 
-# when watcher trigger, regenerate the `index.html`
-reload_html = true
+# Additional CSS style files
+style = []
 
-# which files or dirs will be watcher monitoring
-watch_path = ["src", "assets"]
+# Additional JavaScript files
+script = []
+
+[web.resource.dev]
+
+# Javascript code file
+# serve: [dev-server] only
+script = []
diff --git a/docker/dev/app/Dockerfile b/docker/dev/app/Dockerfile
index c933b70..e4cea56 100644
--- a/docker/dev/app/Dockerfile
+++ b/docker/dev/app/Dockerfile
@@ -1,7 +1,8 @@
 # 1.83.0-bookworm
 FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b
 
-RUN cargo install dioxus-cli diesel_cli
+RUN cargo install dioxus-cli --version 0.6.2 \
+ && cargo install diesel_cli --version 2.2.6
 
 COPY . /srv/app
 WORKDIR /srv/app
diff --git a/docker/prod/app/Dockerfile b/docker/prod/app/Dockerfile
index eccc00d..0fb4e70 100644
--- a/docker/prod/app/Dockerfile
+++ b/docker/prod/app/Dockerfile
@@ -1,11 +1,13 @@
+# 1.83.0-bookworm
 FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b AS builder
 
-RUN cargo install dioxus-cli diesel_cli \
- && apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     nodejs=18.19.0+dfsg-6~deb12u2 \
     npm=9.2.0~ds1-1 \
  && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/lib/apt/lists/* \
+ && cargo install dioxus-cli --version 0.6.2 \
+ && cargo install diesel_cli --version 2.2.6
 
 COPY . /srv/app
 WORKDIR /srv/app
@@ -14,10 +16,11 @@ RUN npm install \
  && npm run build \
  && dx bundle
 
+# bookworm
 FROM debian@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a AS runner
 
 RUN apt-get update \
- && apt-get install -y --no-install-recommends libpq5=15.8-0+deb12u1 \
+ && apt-get install -y --no-install-recommends libpq5=15.10-0+deb12u1 \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*