From 8a13faec4447d9710fcfde3fa0a688ff76cc79ef Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 22 Aug 2020 21:08:36 +0200
Subject: [PATCH] Fixed build script
---
Dockerfile | 4 ++--
package.json | 18 +++++++++++++-----
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 17d8c1e..8f15ae9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,8 @@ FROM node:latest AS builder
COPY package*.json /build/
WORKDIR /build/
RUN npm install
-RUN npm build
COPY . /build/
+RUN npm run build
FROM nginx:latest
-COPY --from=builder /build/ /usr/share/nginx/html/
+COPY --from=builder /build /usr/share/nginx/html
diff --git a/package.json b/package.json
index b0cb1f5..087c5ad 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,24 @@
{
- "name": "kuschku-landing",
+ "name": "quasseldroid-landing",
"version": "1.0.0",
- "description": "",
+ "description": "This is a websearch frontend for a quassel database.",
"scripts": {
- "pug": "node_modules/pug-cli/index.js --basedir . **/index.pug index.pug"
+ "pug": "node_modules/pug-cli/index.js --basedir . $(find . -name index.pug)",
+ "sass": "cd assets/css && make -j8",
+ "css_minify_purifycss": "node_modules/purify-css/bin/purifycss assets/css/important.css index.html privacy-policy/index.html releases/index.html --min --info --out assets/css/important.min1.css",
+ "css_minify_uncss": "node_modules/uncss/bin/uncss index.html privacy-policy/index.html releases/index.html --htmlroot . --stylesheets assets/css/important.min1.css > assets/css/important.min.css",
+ "css_minify": "npm run css_minify_purifycss && npm run css_minify_uncss && rm assets/css/important.min1.css",
+ "images": "assets/images/generate_makefile.sh && cd assets/images && make -j8",
+ "build": "npm run images && npm run sass && npm run pug && npm run css_minify && npm run pug"
},
"author": "Janne Koschinski",
"license": "GPL",
- "homepage": "https://kuschku.de/",
+ "homepage": "https://quasseldroid.info/",
"devDependencies": {
"jstransformer-markdown-it": "^2.1.0",
"node-sass": "^4.14.0",
- "pug-cli": "^1.0.0-alpha6"
+ "pug-cli": "^1.0.0-alpha6",
+ "purify-css": "^1.2.5",
+ "uncss": "^0.17.2"
}
}
--
GitLab