From 1b524e96afe6440db75639c3722cf07dd2f99c90 Mon Sep 17 00:00:00 2001
From: Aidar Turkenov <aqturkenov@gmail.com>
Date: Tue, 30 Sep 2025 17:07:46 +0500
Subject: [PATCH] build: Add .dockerignore and update Dockerfile for improved
 build process

---
 .dockerignore          | 72 ++++++++++++++++++++++++++++++++++++++++++
 Dockerfile             | 19 +++++++++--
 scripts/prepare-web.sh |  5 +--
 3 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..8919199a9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,72 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+*.snap
+.DS_Store
+.local/
+.atom/
+.buildlog/
+.history
+.svn/
+prime
+
+# libolm package
+/assets/js/package
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.packages
+.pub-cache/
+.pub/
+/build/
+
+# Web related
+docs/tailwind.css
+
+# Exceptions to above rules.
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+
+/key.jks
+/android/key.properties
+**/android/app/.cxx
+android/key.jks
+android/keys.json
+android/Gemfile.lock
+lib/l10n/*.dart
+ios/Flutter/.last_build_id
+ios/Podfile.lock
+ios/Runner.ipa
+ios/Runner/GoogleServices-Info.plist
+
+/windows/out
+/winuwp/out
+/linux/out
+/macos/out
+.vs
+olm
+docs/node_modules
+rust
+
+libcrypto.3.dylib
+android/app/src/main/jniLibs/**
+android/app/google-services.json
+web/pkg/package.json
+web/pkg/vodozemac_bindings_dart_bg.wasm
+web/pkg/vodozemac_bindings_dart.js
diff --git a/Dockerfile b/Dockerfile
index 39505aadf..dd1a16f1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,34 @@
 FROM ghcr.io/cirruslabs/flutter as builder
+
 RUN sudo apt update && sudo apt install curl wget jq build-essential -y
 
 WORKDIR /tmp
+
 RUN wget https://github.com/mikefarah/yq/releases/download/v4.40.5/yq_linux_amd64.tar.gz
 RUN tar -xzvf ./yq_linux_amd64.tar.gz
 RUN mv yq_linux_amd64 /usr/bin/yq
 
-COPY . /app
-WORKDIR /app
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
+
 RUN rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
+# use this line for arm chips and comment the above line
+# RUN rustup component add rust-src --toolchain nightly-aarch64-unknown-linux-gnu
+
+WORKDIR /app
+
+COPY ./scripts/prepare-web.sh /app/scripts/prepare-web.sh
 RUN ./scripts/prepare-web.sh
-COPY config.* /app/
+
+COPY pubspec.yaml /app/pubspec.yaml
+COPY pubspec.lock /app/pubspec.lock
 RUN flutter pub get
+
+COPY . /app
+RUN flutter gen-l10n
 RUN flutter build web --dart-define=FLUTTER_WEB_CANVASKIT_URL=canvaskit/ --release --source-maps
 
 FROM docker.io/nginx:alpine
 RUN rm -rf /usr/share/nginx/html
 COPY --from=builder /app/build/web /usr/share/nginx/html
+COPY --from=builder /app/config.json /usr/share/nginx/html
diff --git a/scripts/prepare-web.sh b/scripts/prepare-web.sh
index 13a26ac09..434e13777 100755
--- a/scripts/prepare-web.sh
+++ b/scripts/prepare-web.sh
@@ -7,6 +7,7 @@ cd .vodozemac
 cargo install flutter_rust_bridge_codegen
 flutter_rust_bridge_codegen build-web --dart-root dart --rust-root $(readlink -f rust) --release
 cd ..
-rm -f ./assets/vodozemac/vodozemac_bindings_dart*
+# rm -f ./assets/vodozemac/vodozemac_bindings_dart*
+mkdir -p ./assets/vodozemac
 mv .vodozemac/dart/web/pkg/vodozemac_bindings_dart* ./assets/vodozemac/
-rm -rf .vodozemac
\ No newline at end of file
+rm -rf .vodozemac