diff --git a/Dockerfile b/Dockerfile index cbcba7841b979264cbbed4f148af09806c25fad2..9dfcd3c888cb3929e995dab62e3145e7ba4e19cd 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 094e1752fa0b4842a3acb6273c00443c60c82038..f476686e6194ccfef00e4713e05834f6cc1bf78a 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",