Skip to content

Commit 2be5e9a

Browse files
committed
fix:Dockerfile build failed
1 parent a953960 commit 2be5e9a

8 files changed

Lines changed: 63 additions & 15 deletions

File tree

.dockerignore

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
.git
2+
.gradle
3+
.idea
4+
.vscode
5+
.DS_Store
6+
7+
**/.DS_Store
8+
**/.gradle
9+
**/build
10+
**/bin
11+
12+
web/.react-router
13+
web/.source
14+
web/build
15+
web/node_modules
16+
17+
integration-test
18+
tools
19+
vul

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ FROM --platform=$BUILDPLATFORM buildpack-deps:bullseye-scm AS source
22

33
WORKDIR /usr/src
44

5-
RUN git clone --depth 1 https://github.com/ReaJason/MemShellParty.git . && \
6-
rm -rf vul integration-test tools
5+
COPY . .
6+
7+
RUN rm -rf vul integration-test tools
78

89
# https://hub.docker.com/r/oven/bun
9-
FROM --platform=$BUILDPLATFORM oven/bun:1.3.11 AS frontend
10+
FROM --platform=$BUILDPLATFORM oven/bun:1.3.14 AS frontend
1011

1112
ARG ROUTE_ROOT_PATH=""
1213
ARG CONTEXT_PATH=""
@@ -17,15 +18,16 @@ ENV VITE_APP_API_URL=${CONTEXT_PATH} \
1718
VITE_APP_BASE_PATH=${ROUTE_ROOT_PATH}/ui
1819

1920
COPY --from=source /usr/src/web/package.json /usr/src/web/bun.lock /usr/src/web/source.config.ts /usr/src/web/
21+
COPY --from=source /usr/src/web/patches /usr/src/web/patches
2022

2123
RUN bun install --frozen-lockfile
2224

2325
COPY --from=source /usr/src/web /usr/src/web
2426

2527
RUN bun run build
2628

27-
# https://hub.docker.com/_/eclipse-temurin/tags?name=17.
28-
FROM --platform=$BUILDPLATFORM eclipse-temurin:17.0.17_10-jdk-noble AS backend
29+
# https://hub.docker.com/_/eclipse-temurin/tags?name=21.
30+
FROM --platform=$BUILDPLATFORM eclipse-temurin:21.0.11_10-jdk-noble AS backend
2931

3032
WORKDIR /usr/src
3133

@@ -35,7 +37,7 @@ COPY --from=frontend /usr/src/boot/src/main/resources /usr/src/boot/src/main/res
3537

3638
RUN ./gradlew :boot:bootjar -x test
3739

38-
FROM eclipse-temurin:17.0.17_10-jre-noble
40+
FROM eclipse-temurin:21.0.11_10-jre-noble
3941

4042
LABEL authors="ReaJason<reajason1225@gmail.com>"
4143

web/app/docs/search.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ const server = createFromSource(source, {
1313
},
1414
});
1515

16-
export async function loader() {
16+
export async function clientLoader() {
1717
return server.staticGET();
1818
}

web/app/llms/full.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { getLLMText, source } from "@/lib/source";
22

3-
export async function loader() {
3+
export async function clientLoader() {
44
const scan = source.getPages().map(getLLMText);
55
const scanned = await Promise.all(scan);
66

web/app/llms/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import { llms } from "fumadocs-core/source";
22

33
import { source } from "@/lib/source";
44

5-
export function loader() {
5+
export function clientLoader() {
66
return new Response(llms(source).index());
77
}

web/bun.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/patches/@react-router%2Fdev@8.0.1.patch

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/dist/typegen-9e9g0hnu.js b/dist/typegen-9e9g0hnu.js
2-
index 6366c6d25580717735456d8bacb9a6b159adfbdc..31674246fed0b70527d7541e2dade4ff4fe8b15f 100644
2+
index 6366c6d25580717735456d8bacb9a6b159adfbdc..ffa720bfccc8d4367a7995f2ae3c1dc91753b176 100644
33
--- a/dist/typegen-9e9g0hnu.js
44
+++ b/dist/typegen-9e9g0hnu.js
55
@@ -95,7 +95,7 @@ async function createContext$1({ root, mode, customLogger }) {
@@ -11,11 +11,30 @@ index 6366c6d25580717735456d8bacb9a6b159adfbdc..31674246fed0b70527d7541e2dade4ff
1111
plugins: [],
1212
environments: { __config_loader: {
1313
consumer: "server",
14+
@@ -545,8 +545,8 @@ var babel_exports = /* @__PURE__ */ __exportAll({
15+
t: () => t$1,
16+
traverse: () => traverse
17+
});
18+
-const traverse = _traverse.default;
19+
-const generate = _generate.default;
20+
+const traverse = _traverse.default ?? _traverse;
21+
+const generate = _generate.default ?? _generate;
22+
//#endregion
23+
//#region typegen/params.ts
24+
function parse(fullpath) {
1425
diff --git a/dist/vite.js b/dist/vite.js
15-
index 6590bdb00df5ead362d1ea1e2db841d1f68d47c8..9c27fe86dc285eafde6db537f280f22f38e3622a 100644
26+
index 6590bdb00df5ead362d1ea1e2db841d1f68d47c8..46c5bded20b0610d567293277e97bbb0387d895a 100644
1627
--- a/dist/vite.js
1728
+++ b/dist/vite.js
18-
@@ -1592,7 +1592,7 @@ const reactRouterVitePlugin = () => {
29+
@@ -950,6 +950,7 @@ async function startPreviewServer(viteConfig) {
30+
configFile: viteConfig.configFile,
31+
logLevel: "silent",
32+
preview: {
33+
+ host: "127.0.0.1",
34+
port: 0,
35+
open: false
36+
}
37+
@@ -1592,7 +1593,7 @@ const reactRouterVitePlugin = () => {
1938
hmr: false
2039
},
2140
configFile: false,

web/react-router.config.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,15 @@ export default {
1111
ssr: false,
1212
async prerender({ getStaticPaths }) {
1313
const paths: string[] = [];
14-
const excluded: string[] = [];
14+
const excluded = [
15+
"/",
16+
"/about",
17+
"/api/search",
18+
"/llms.txt",
19+
"/llms-full.txt",
20+
"/memshell",
21+
"/probeshell",
22+
];
1523

1624
for (const path of getStaticPaths()) {
1725
if (!excluded.includes(path)) paths.push(path);

0 commit comments

Comments
 (0)