From 55787942c70a7729bf26a529151f13018d9703c4 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 14 Dec 2023 15:17:10 +0800 Subject: [PATCH 1/5] :art: Remove git in the image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b97fbf7b..d8b5b6b6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /go/src/github.com/siyuan-note/siyuan/ COPY --from=NODE_BUILD /go/src/github.com/siyuan-note/siyuan/ /go/src/github.com/siyuan-note/siyuan/ ENV GO111MODULE=on ENV CGO_ENABLED=1 -RUN apk add --no-cache gcc musl-dev git && \ +RUN apk add --no-cache gcc musl-dev && \ cd kernel && go build --tags fts5 -v -ldflags "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" && \ mkdir /opt/siyuan/ && \ mv /go/src/github.com/siyuan-note/siyuan/app/appearance/ /opt/siyuan/ && \ From 3f38302731abb823f103a9e7ba36f4d1f15857bb Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 14 Dec 2023 15:47:27 +0800 Subject: [PATCH 2/5] :art: Upgrade docker image node version to 16 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d8b5b6b6c..7e0428881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 as NODE_BUILD +FROM node:21 as NODE_BUILD WORKDIR /go/src/github.com/siyuan-note/siyuan/ ADD . /go/src/github.com/siyuan-note/siyuan/ RUN cd app && npm install -g pnpm && pnpm install && pnpm run build From 4d5f5380088e34de5ab5c11ff8e2811dfed95704 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 14 Dec 2023 16:51:35 +0800 Subject: [PATCH 3/5] :art: Use golang:latest to build image --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7e0428881..bf51ffbcc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,12 @@ WORKDIR /go/src/github.com/siyuan-note/siyuan/ ADD . /go/src/github.com/siyuan-note/siyuan/ RUN cd app && npm install -g pnpm && pnpm install && pnpm run build -FROM golang:alpine as GO_BUILD +FROM golang:latest as GO_BUILD WORKDIR /go/src/github.com/siyuan-note/siyuan/ COPY --from=NODE_BUILD /go/src/github.com/siyuan-note/siyuan/ /go/src/github.com/siyuan-note/siyuan/ ENV GO111MODULE=on ENV CGO_ENABLED=1 -RUN apk add --no-cache gcc musl-dev && \ - cd kernel && go build --tags fts5 -v -ldflags "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" && \ +RUN cd kernel && go build --tags fts5 -v -ldflags "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" && \ mkdir /opt/siyuan/ && \ mv /go/src/github.com/siyuan-note/siyuan/app/appearance/ /opt/siyuan/ && \ mv /go/src/github.com/siyuan-note/siyuan/app/stage/ /opt/siyuan/ && \ From cdfdbc863894a92975edf1ff916c3547570e16f5 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 14 Dec 2023 20:05:41 +0800 Subject: [PATCH 4/5] :art: Use golang:alpine to build image --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bf51ffbcc..7e0428881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,13 @@ WORKDIR /go/src/github.com/siyuan-note/siyuan/ ADD . /go/src/github.com/siyuan-note/siyuan/ RUN cd app && npm install -g pnpm && pnpm install && pnpm run build -FROM golang:latest as GO_BUILD +FROM golang:alpine as GO_BUILD WORKDIR /go/src/github.com/siyuan-note/siyuan/ COPY --from=NODE_BUILD /go/src/github.com/siyuan-note/siyuan/ /go/src/github.com/siyuan-note/siyuan/ ENV GO111MODULE=on ENV CGO_ENABLED=1 -RUN cd kernel && go build --tags fts5 -v -ldflags "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" && \ +RUN apk add --no-cache gcc musl-dev && \ + cd kernel && go build --tags fts5 -v -ldflags "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" && \ mkdir /opt/siyuan/ && \ mv /go/src/github.com/siyuan-note/siyuan/app/appearance/ /opt/siyuan/ && \ mv /go/src/github.com/siyuan-note/siyuan/app/stage/ /opt/siyuan/ && \ From 554b1f77694ce7e4d008855dfbda5bfb61da2845 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 14 Dec 2023 20:19:59 +0800 Subject: [PATCH 5/5] :art: Fix docker build --- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index 73b9eb5b4..21da14c93 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -168,7 +168,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/mattn/go-sqlite3 => github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 +replace github.com/mattn/go-sqlite3 => github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 //replace github.com/siyuan-note/dejavu => D:\88250\dejavu //replace github.com/siyuan-note/riff => D:\88250\riff diff --git a/kernel/go.sum b/kernel/go.sum index 14c8aabca..1ddd7a904 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -6,8 +6,8 @@ github.com/88250/clipboard v0.1.5 h1:V/mCiSrjwmIiJwvchGTs+W2ozdINxk7y7KgHNTSzlCI github.com/88250/clipboard v0.1.5/go.mod h1:bNLJx4L8cF6fEgiXMPVrK1Iidnaff8BTkktTNtefcks= github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48 h1:qiE88Pw/9GG8hvMfpfB4aUhnIikZTwG+Z/Xbn0a9R14= github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48/go.mod h1:UgVSq5iO9pOvqs3hIGNVk6WXDiAB0v3Dlg4nssQJ7W4= -github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXSiEXYAo8Zbi/r2Ld6Dd4MmGHgir3EaSuHQ= -github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceTVVqrYaDlLio2QSKbXMUmAZPbzCwT5eNCw= +github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c h1:Fas3hxqP33xA9KKDV50jUmppiiOukk5bdV00Hk5VSSk= github.com/88250/gulu v1.2.3-0.20231209020950-b7b6994e395c/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k= github.com/88250/lute v1.7.6-0.20231213154422-cae466b8b3a7 h1:Hav/8eI6gIQBu8qHt+tA1PZUtoTQg6UGR3QP+ZjcxKM=