From 245be7786f0a73fd4873887be5d84c89690cbdcb Mon Sep 17 00:00:00 2001
From: jonasled <git@jonasled.de>
Date: Sun, 28 Feb 2021 11:48:25 +0100
Subject: [PATCH] setup yarn scripts and added new commands to build script
---
Dockerfile | 6 ++----
package.json | 5 +++++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index cbcba78..9dfcd3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,10 +4,8 @@ WORKDIR /build
COPY . /build
RUN mkdir /build/public/js
RUN mkdir /build/public/css
-RUN npm install -g sass
-RUN npm install -g typescript
-RUN tsc
-RUN sass scss/:public/css --style=compressed --no-source-map
+RUN yarn init
+RUN yarn compile
# Prepare Webserver
ARG INSTALL_CRON=0
diff --git a/package.json b/package.json
index 094e175..f476686 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,11 @@
"repository": "git@gitlab.jonasled.de:jonasled/website.git",
"author": "jonasled <git@jonasled.de>",
"license": "LGPL-3.0-or-later",
+ "scripts": {
+ "compile": "concurrently \"yarn css\" \"yarn js\"",
+ "css": "sass scss/:public/css --style=compressed --no-source-map",
+ "js": "tsc"
+ },
"devDependencies": {
"@types/node": "^14.14.31",
"sass": "^1.32.8",
--
GitLab