diff --git a/.github/workflows/build.disabled-yml b/.github/workflows/build.yml similarity index 100% rename from .github/workflows/build.disabled-yml rename to .github/workflows/build.yml diff --git a/.github/workflows/release.disabled-yml b/.github/workflows/release.yml similarity index 97% rename from .github/workflows/release.disabled-yml rename to .github/workflows/release.yml index db71fae..9123bb5 100644 --- a/.github/workflows/release.disabled-yml +++ b/.github/workflows/release.yml @@ -87,4 +87,4 @@ jobs: env: KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} with: - args: apply -n portals -f k8s/deployment_mod.yaml \ No newline at end of file + args: apply -n vc-repository -f k8s/deployment_mod.yaml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0f5d1fd..17750e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,12 @@ -FROM docker.io/node:20 -ADD .output/ /app - +FROM docker.io/gplane/pnpm as buildstage +COPY ./package.json /build/ +WORKDIR /build +RUN pnpm install +COPY ./ /build +RUN pnpm run build +# RUN +FROM docker.io/node:20-alpine +COPY --from=buildstage /build/.output/ /app WORKDIR /app - EXPOSE 3000 -ENTRYPOINT node server/index.mjs +ENTRYPOINT node server/index.mjs \ No newline at end of file diff --git a/Dockerfile2 b/Dockerfile-bun-official-erroring similarity index 67% rename from Dockerfile2 rename to Dockerfile-bun-official-erroring index 702c7aa..03786a4 100644 --- a/Dockerfile2 +++ b/Dockerfile-bun-official-erroring @@ -1,5 +1,14 @@ -FROM oven/bun as base -WORKDIR /app +################################################### +# ERROR [nuxt] [request error] [unhandled] [500] first argument must be an ArrayBufferView or an ArrayBuffer (near '...stantiate(wasm, obj));...') +# https://github.com/nuxt/content/issues/2334 +################################################### + + + +# use the official Bun image +# see all versions at https://hub.docker.com/r/oven/bun/tags +FROM oven/bun:1 as base +WORKDIR /usr/src/app # install dependencies into temp directory # this will cache them and speed up future builds @@ -33,4 +42,4 @@ COPY --from=prerelease /usr/src/app/package.json . # run the app USER bun EXPOSE 3000/tcp -ENTRYPOINT [ "bun", "run", "index.ts" ] +ENTRYPOINT [ "bun", "run", "index.ts" ] \ No newline at end of file diff --git a/oldDockerfile b/oldDockerfile deleted file mode 100644 index e300667..0000000 --- a/oldDockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# BUILD -FROM oven/bun:canary-debian AS build - -COPY . /build - -WORKDIR /build -RUN bun install # nuxt build -> Building client... - - -RUN bun run build # You can preview this build using node .output/server/index.mjs - -# RUN -FROM docker.io/node:20 -COPY --from=build /build/.output/ /app - -WORKDIR /app - -EXPOSE 3000 -ENTRYPOINT node server/index.mjs - diff --git a/package.json b/package.json index d12d326..7a9c04e 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "nuxt-icon": "^0.5.0", "nuxt-monaco-editor": "^1.2.3", "nuxt-security": "1.0.0-rc.2", - "tailwindcss": "^3.3.3" + "tailwindcss": "^3.3.3", + "vue-router": "^4.2.5" }, "dependencies": { "@headlessui/vue": "^1.7.16",