diff --git a/roverctl-web/.dockerignore b/roverctl-web/.dockerignore index ffdff94..4756dcf 100644 --- a/roverctl-web/.dockerignore +++ b/roverctl-web/.dockerignore @@ -9,7 +9,6 @@ README.md .eslintrc.cjs .graphqlrc .editorconfig -.svelte-kit .vscode node_modules build diff --git a/roverctl-web/Dockerfile b/roverctl-web/Dockerfile index 34bb35a..144900c 100644 --- a/roverctl-web/Dockerfile +++ b/roverctl-web/Dockerfile @@ -1,9 +1,9 @@ # Source: https://gist.github.com/aradalvand/04b2cad14b00e5ffe8ec96a3afbb34fb -FROM oven/bun:1-alpine AS builder +FROM oven/bun:1 AS builder WORKDIR /app -COPY package*.json . -COPY bun.lockb* . -RUN bun install +COPY package*.json ./ +COPY bun.lock* ./ +RUN bun install --frozen-lockfile COPY . . # These are runtime arguments, but they do need to exist at built time to be able to import from public in svelte ARG PUBLIC_ROVERD_HOST="" @@ -14,9 +14,9 @@ ARG PUBLIC_PASSTHROUGH_HOST="" ARG PUBLIC_PASSTHROUGH_PORT="" RUN bun run build -RUN bun install --production +RUN rm -rf node_modules && bun install --frozen-lockfile --production -FROM oven/bun:1-alpine +FROM oven/bun:1 WORKDIR /app COPY --from=builder /app/build build/ COPY --from=builder /app/node_modules node_modules/ diff --git a/roverctl-web/bun.lock b/roverctl-web/bun.lock index 522dab3..e2040db 100644 --- a/roverctl-web/bun.lock +++ b/roverctl-web/bun.lock @@ -1,10 +1,10 @@ { "lockfileVersion": 1, - "configVersion": 0, "workspaces": { "": { "name": "ase-roverctl-web", "dependencies": { + "@bufbuild/protobuf": "^2.10.2", "@floating-ui/dom": "1.6.12", "@iconify-icons/bx": "^1.2.6", "@paralleldrive/cuid2": "^2.2.2", @@ -15,9 +15,9 @@ "chart.js": "^4.4.7", "chartjs-adapter-luxon": "^1.3.1", "dagre": "^0.8.5", - "rovercom": "github:VU-ASE/rovercom#v2.0.0", "js-yaml": "^4.1.0", "jszip": "^3.10.1", + "rovercom": "github:VU-ASE/rovercom#v2.0.0", "strip-ansi": "^7.1.0", "svelte-french-toast": "^1.2.0", "svelte-persisted-store": "^0.12.0", @@ -66,6 +66,8 @@ "@antfu/utils": ["@antfu/utils@0.7.10", "", {}, "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww=="], + "@bufbuild/protobuf": ["@bufbuild/protobuf@2.10.2", "", {}, "sha512-uFsRXwIGyu+r6AMdz+XijIIZJYpoWeYzILt5yZ2d3mCjQrWUTVpVD9WL/jZAbvp+Ed04rOhrsk7FiTcEDseB5A=="], + "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.21.5", "", { "os": "aix", "cpu": "ppc64" }, "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ=="], "@esbuild/android-arm": ["@esbuild/android-arm@0.21.5", "", { "os": "android", "cpu": "arm" }, "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg=="], diff --git a/roverctl-web/package.json b/roverctl-web/package.json index dc2553a..62216ac 100644 --- a/roverctl-web/package.json +++ b/roverctl-web/package.json @@ -46,6 +46,7 @@ }, "type": "module", "dependencies": { + "@bufbuild/protobuf": "^2.10.2", "@floating-ui/dom": "1.6.12", "@iconify-icons/bx": "^1.2.6", "@paralleldrive/cuid2": "^2.2.2",