Merge branch 'main' into deploy

Merge branch 'feature/docker'
added dockerfile using busybox httpd to serve files
2025-02-15 11:59:35 +00:00 · 2025-02-15 11:59:02 +00:00 · 2025-02-15 11:58:53 +00:00 · 2025-02-15 11:08:53 +00:00 · 2025-02-09 21:09:53 +00:00 · 2025-02-08 10:10:06 +00:00
3 changed files with 31 additions and 0 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+dist
+node_modules
+.git
+.idea
--- a/26
+++ b/26
@@ -0,0 +1,26 @@
+FROM node:20-alpine AS build
+
+WORKDIR /build
+
+# install packages first
+COPY package* .
+RUN npm ci
+
+# copy everything else and run the build
+COPY . .
+RUN npm run build
+
+FROM busybox:1.37 AS httpd
+
+# add user to run web server as
+RUN adduser -D static
+USER static
+WORKDIR /home/static
+
+# copy build files from the node worker
+COPY --from=build /build/dist /home/static
+
+EXPOSE 3000
+# run httpd in foreground, verbose, on port 3000
+CMD ["busybox", "httpd", "-f", "-v", "-p", "3000"]
+
--- a/index.html
+++ b/index.html
@@ -6,6 +6,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<meta name="color-scheme" content="light" />
 		<title>Daily Time Tracking</title>
+		<script defer src="https://umami.knier.uk/script.js" data-website-id="8776a11a-9f28-49f4-9b95-87cf1317a9a1"></script>
 	</head>
 	<body>
 		<div id="app"></div>
Author	SHA1	Message	Date
Sam Stevens	0356721279	Merge branch 'main' into deploy	2025-02-15 11:59:35 +00:00
Sam Stevens	7ba9b27019	Merge branch 'feature/docker'	2025-02-15 11:59:02 +00:00
Sam Stevens	d7babf7230	added dockerfile using busybox httpd to serve files	2025-02-15 11:58:53 +00:00
Sam Stevens	24d3df7f2d	Merge branch 'main' into deploy	2025-02-15 11:08:53 +00:00
Sam Stevens	1fcb525211	Merge branch 'main' into deploy	2025-02-09 21:09:53 +00:00
Sam Stevens	e2b406946f	Merge branch 'main' into deploy	2025-02-08 10:10:06 +00:00
Sam Stevens	74d95f08f5	added analytics	2025-02-08 09:24:03 +00:00