Merge pull request #76 from gandlafbtc/version-0.1.10

Version 0.1.10
gandlafbtc · Apr 18, 2023 · 5b5edb0 · 5b5edb0 · vercel · Apr 18, 2023
2 parents f8aa234 + 9638a49
commit 5b5edb0
Show file tree

Hide file tree

Showing 22 changed files with 627 additions and 710 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -6,6 +6,7 @@ node_modules
 .env
 .env.*
 !.env.example
+/http/*.min.js
 
 # Ignore files for PNPM, NPM and YARN
 pnpm-lock.yaml

diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,20 @@
-FROM node:current-alpine
+FROM node:alpine as build
+WORKDIR /nutstash
+COPY . .
+COPY ./http/app.html ./src/app.html
+COPY ./http/svelte.config.js ./svelte.config.js
+COPY ./http/asmcrypto.all.es5.min.js ./static/asmcrypto.all.es5.min.js
+COPY ./http/webcrypto-liner.shim.min.js ./static/webcrypto-liner.shim.min.js
 
-COPY --chown=1000:1000 .  /app 
+RUN npm i
+RUN npm run build
 
-RUN cd /app \
-    && npm install \
-    && npm run build
+FROM node:alpine as prod
+COPY ./package*.json ./
+RUN npm ci --production --silent --ignore-scripts
+COPY --from=build /nutstash/build ./build
+COPY --from=build /nutstash/docker-startup.sh ./build
 
-LABEL org.opencontainers.image.source https://github.com/gandlafbtc/nutstash-wallet
-
-WORKDIR /app
-
-EXPOSE 4173/tcp
-
-CMD [ "npm", "run", "preview", "--", "--host" ]
+EXPOSE 3000/tcp
+USER node
+CMD [ "/bin/sh", "build/docker-startup.sh" ]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
       platforms:
         - 'linux/amd64'
         - 'linux/arm64'
-    user: '1000:1000'
+    user: '1000:node'
     restart: on-failure
     ports:
-      - '4173:4173'
+      - '3000:3000'
diff --git a/docker-startup.sh b/docker-startup.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+node ./build/
diff --git a/http/app.html b/http/app.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en" data-theme="dark">
+	<head>
+		<link rel="manifest" href="/manifest.json" />
+		<link rel="apple-touch-icon" href="/maskable_icon_x192.png" />
+		<meta name="theme-color" content="#212121" />
+		<meta charset="utf-8" />
+		<link rel="icon" href="%sveltekit.assets%/favicon.ico" />
+		<meta name="viewport" content="width=device-width" />
+		<script src="asmcrypto.all.es5.min.js"></script>
+		<script src="webcrypto-liner.shim.min.js"></script>
+
+		%sveltekit.head%
+	</head>
+	<body data-sveltekit-preload-data="hover">
+		<div style="display: contents">%sveltekit.body%</div>
+	</body>
+</html>
diff --git a/http/asmcrypto.all.es5.min.js b/http/asmcrypto.all.es5.min.js
diff --git a/http/svelte.config.js b/http/svelte.config.js
@@ -0,0 +1,13 @@
+import adapter from '@sveltejs/adapter-node';
+import { vitePreprocess } from '@sveltejs/kit/vite';
+
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+	preprocess: vitePreprocess(),
+
+	kit: {
+		adapter: adapter()
+	}
+};
+
+export default config;
diff --git a/http/webcrypto-liner.shim.min.js b/http/webcrypto-liner.shim.min.js