Merge pull request #662 from walt-id/openid-refactoring

Distributed & persisted issuer/verifier sessions

.dockerignore

@@ -1,18 +1,20 @@
-*/build
-*/.nuxt
-*/node_modules
-*/Dockerfile
-*/docker-compose*
-*/.dockerignore
-*/.git
-*/.gitignore
-*/README.md
+**/build
+**/.nuxt
+**/node_modules
+**/Dockerfile
+**/docker-compose*
+**/.dockerignore
+**/.git
+**/.gitignore
+**/README.md
 */LICENSE
 */.vscode
 */Makefile
 */helm-charts
 #*/.env
-*/.editorconfig
+**/.editorconfig
+*/dist
+**/.output
 **/.idea
 */coverage*
 .gradle
@@ -21,4 +23,4 @@
 #**.png
 #**.jpeg
 #**.jpg
-*/k8s
+**/k8s

waltid-applications/waltid-web-wallet/Dockerfile

@@ -1,32 +1,36 @@
 # use the official Bun image
 # see all versions at https://hub.docker.com/r/oven/bun/tags
-FROM oven/bun:1 as base
+
+FROM gplane/pnpm:9.6 AS base
+#FROM oven/bun:1 AS base
+
 WORKDIR /app
 
 # install dependencies into temp directory
 # this will cache them and speed up future builds
 FROM base AS install
 RUN mkdir -p /temp/dev
-COPY waltid-applications/waltid-web-wallet/package.json waltid-applications/waltid-web-wallet/bun.lockb /temp/dev/
-RUN cd /temp/dev && bun install --frozen-lockfile
+#COPY waltid-applications/waltid-web-wallet/package.json waltid-applications/waltid-web-wallet/bun.lockb /temp/dev/
+COPY waltid-applications/waltid-web-wallet/package.json waltid-applications/waltid-web-wallet/pnpm-lock.yaml /temp/dev/
+RUN cd /temp/dev && pnpm install --frozen-lockfile
 
 # install with --production (exclude devDependencies)
 RUN mkdir -p /temp/prod
-COPY waltid-applications/waltid-web-wallet/package.json waltid-applications/waltid-web-wallet/bun.lockb /temp/prod/
-RUN cd /temp/prod && bun install --frozen-lockfile --production
+#COPY waltid-applications/waltid-web-wallet/package.json waltid-applications/waltid-web-wallet/bun.lockb /temp/prod/
+COPY waltid-applications/waltid-web-wallet/package.json waltid-applications/waltid-web-wallet/pnpm-lock.yaml /temp/prod/
+# RUN cd /temp/prod && pnpm install --frozen-lockfile --production
+RUN cd /temp/prod && pnpm install --frozen-lockfile --production
 
 # copy node_modules from temp directory
 # then copy all (non-ignored) project files into the image
 FROM base AS prerelease
 COPY --from=install /temp/dev/node_modules node_modules
 COPY waltid-applications/waltid-web-wallet/ .
-RUN ls
-
+RUN ls -la
 
 # [optional] tests & build
 ENV NODE_ENV=production
-RUN bun test
-RUN bun run build
+RUN pnpm run build
 
 # copy production dependencies and source code into final image
 FROM base AS release
@@ -36,7 +40,7 @@ COPY --from=prerelease /app/package.json .
 
 # run the app
 RUN chmod -R a+r .
-USER bun
+USER app
 EXPOSE 7101/tcp
 ENV PORT=7101
-ENTRYPOINT [ "bun", "run", "server/index.mjs" ]
+ENTRYPOINT [ "pnpm", "run", "server/index.mjs" ]

waltid-applications/waltid-web-wallet/README.md

@@ -30,7 +30,7 @@ cd docker-compose && docker compose up
 
 Update the containers by running the following commands from the root folder: 
 ```bash
-docker build -f waltid-web-wallet/Dockerfile -t waltid/waltid-web-wallet .
+docker build -f waltid-applications/waltid-web-wallet/Dockerfile -t waltid/waltid-web-wallet .
 ```
 Note that this is project only the frontend of the web-wallet. The corresponding backend is in the /waltid-wallet-api folder.