From 0e61c59fdd5446d2b8aeb425574e151ab8874988 Mon Sep 17 00:00:00 2001 From: aethrvmn Date: Fri, 5 Dec 2025 12:12:32 +0100 Subject: [PATCH] updated docker from nim 1.6.4 to 2.2.4 - Updated docker image to `2.2.4-ubuntu-regular` - Removed deprecated `version` tag from `docker-compose.yml` - Converted `nimble c` calls to `nim c`, and added `--mm:refc` of final binary, because it gets segfault using ORC --- docker/Dockerfile | 6 +++++- docker/docker-compose.yml | 2 -- docker/entrypoint.sh | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4e5ca012..61d70146 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,14 +1,18 @@ -FROM nimlang/nim:1.6.4-ubuntu +FROM nimlang/nim:2.2.4-ubuntu-regular RUN apt-get update -yqq \ && apt-get install -y --no-install-recommends \ libsass-dev \ sqlite3 \ + libpcre3 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* WORKDIR /app COPY . /app +# add /app as safe.directory +RUN git config --global --add safe.directory /app + # install dependencies RUN nimble install -Y diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 86572350..340cb78a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: forum: build: diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index d8f59230..375652bf 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -5,15 +5,15 @@ set -eu git submodule update --init --recursive # setup -nimble c -d:release src/setup_nimforum.nim +nim c -d:release src/setup_nimforum.nim ./src/setup_nimforum --dev # build frontend -nimble c -r src/buildcss -nimble js -d:release src/frontend/forum.nim +nim c -r src/buildcss +nim js -d:release src/frontend/forum.nim mkdir -p public/js cp src/frontend/forum.js public/js/forum.js # build backend -nimble c src/forum.nim +nim c -mm:refc src/forum.nim ./src/forum