From 9cb0d296fbd468013693152251a2b778c369a140 Mon Sep 17 00:00:00 2001
From: ge <gechandev@gmail.com>
Date: Sun, 26 Jan 2025 00:46:54 +0300
Subject: [PATCH] use fresh V in Dockerfile, upd build vflags, del unused
 dependency

---
 .gitignore |  2 ++
 Dockerfile | 15 +++++++++++++--
 Makefile   |  2 +-
 v.mod      |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 70f39b2..2b7e7d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ bin/
 
 # ENV
 .env
+
+*.todo
diff --git a/Dockerfile b/Dockerfile
index 931fbd3..c31edda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,17 @@
-FROM thevlang/vlang:latest AS builder
+FROM debian:bookworm AS vlang
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates gcc clang make git binutils libssl-dev libatomic1 && \
+    apt clean && rm -rf /var/cache/apt/archives/* && \
+    rm -rf /var/lib/apt/lists/*
+RUN git clone --depth=1 https://github.com/vlang/v /opt/v && \
+    cd /opt/v && \
+    make && \
+    /opt/v/v symlink && \
+    v version
+
+FROM vlang AS builder
 COPY . .
-RUN v -prod -skip-unused -cc gcc -cflags -static -cflags -s -d hv_version=$(git describe --tags) . -o /habraview
+RUN v -prod -cflags -static -cflags -s -d hv_version=$(git describe --tags) . -o /habraview
 
 FROM scratch AS prod
 COPY --from=builder /habraview .
diff --git a/Makefile b/Makefile
index 3b2d4b4..7ed5c0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
 bin:
-	v -prod -skip-unused -cflags -static -d hv_version=$$(git describe --tags) .
+	v -prod -cflags -static -d hv_version=$$(git describe --tags) .
diff --git a/v.mod b/v.mod
index 6a235dc..41dfd0d 100644
--- a/v.mod
+++ b/v.mod
@@ -3,5 +3,5 @@ Module {
 	description: 'Habr.com posts viewer'
 	version: '0.0.1'
 	license: 'Unlicense'
-	dependencies: ['whisker']
+	dependencies: []
 }