matous-volf/todo-baggins
1
0
Fork 0
Code Issues 26 Pull Requests Actions Projects 1 Activity

build: bump the Dockerfile dependencies #91

Merged
matous-volf merged 2 commits from build/bump-dependencies into main 2025-01-29 21:43:34 +00:00
Conversation 0 Commits 2 Files Changed 4 +25 -21
4 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/rust-check.yaml vendored
View File

@@ -21,9 +21,9 @@ jobs:
run: > run: >
apt-get update && apt-get install -y apt-get update && apt-get install -y
libgtk-3-dev=3.24.33-1ubuntu2.2 libgtk-3-dev=3.24.33-1ubuntu2.2
libjavascriptcoregtk-4.1-dev=2.46.4-0ubuntu0.22.04.1 libjavascriptcoregtk-4.1-dev=2.46.5-0ubuntu0.22.04.1
libsoup-3.0-dev=3.0.7-0ubuntu1 libsoup-3.0-dev=3.0.7-0ubuntu1
libwebkit2gtk-4.1-dev=2.46.4-0ubuntu0.22.04.1 libwebkit2gtk-4.1-dev=2.46.5-0ubuntu0.22.04.1
libxdo-dev=1:3.20160805.1-4 libxdo-dev=1:3.20160805.1-4
- name: Rust toolchain installation - name: Rust toolchain installation
uses: dtolnay/rust-toolchain@0579bb9e1907e560c2f263f705f93655a44a07e5 uses: dtolnay/rust-toolchain@0579bb9e1907e560c2f263f705f93655a44a07e5

28
Dioxus.toml
View File

@@ -3,25 +3,25 @@
# App (Project) Name # App (Project) Name
name = "todo-baggins" name = "todo-baggins"
# Dioxus App Default Platform # For font files to get referenced in CSS files by their original names, without the hash Dioxus appends.
# web, desktop, fullstack
default_platform = "fullstack"
# `build` & `serve` dist path
out_dir = "dist"
# resource (assets) file folder
asset_dir = "assets" asset_dir = "assets"
[web.app] [web.app]
# HTML title tag content # 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` # Additional CSS style files
reload_html = true style = []
# which files or dirs will be watcher monitoring # Additional JavaScript files
watch_path = ["src", "assets"] script = []
[web.resource.dev]
# Javascript code file
# serve: [dev-server] only
script = []

3
docker/dev/app/Dockerfile
View File

@@ -1,7 +1,8 @@
# 1.83.0-bookworm # 1.83.0-bookworm
FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b 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 COPY . /srv/app
WORKDIR /srv/app WORKDIR /srv/app

11
docker/prod/app/Dockerfile
View File

@@ -1,11 +1,13 @@
# 1.83.0-bookworm
FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b AS builder FROM rust@sha256:a45bf1f5d9af0a23b26703b3500d70af1abff7f984a7abef5a104b42c02a292b AS builder
RUN cargo install dioxus-cli diesel_cli \ RUN apt-get update && apt-get install -y --no-install-recommends \
&& apt-get update && apt-get install -y --no-install-recommends \
nodejs=18.19.0+dfsg-6~deb12u2 \ nodejs=18.19.0+dfsg-6~deb12u2 \
npm=9.2.0~ds1-1 \ npm=9.2.0~ds1-1 \
&& apt-get clean \ && 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 COPY . /srv/app
WORKDIR /srv/app WORKDIR /srv/app
@@ -14,10 +16,11 @@ RUN npm install \
&& npm run build \ && npm run build \
&& dx bundle && dx bundle
# bookworm
FROM debian@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a AS runner FROM debian@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a AS runner
RUN apt-get update \ 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 \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*