From e81138f1d3e9e86b4bd48987c62643990327941c Mon Sep 17 00:00:00 2001 From: jkoberg Date: Tue, 19 Oct 2021 10:28:07 +0200 Subject: [PATCH] install yarn in Makefile --- Dockerfile | 4 ---- accounts/Makefile | 1 + graph-explorer/Makefile | 1 + web/Makefile | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b31071e7a..5a8b197ae6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,6 @@ FROM owncloudci/golang:1.17 as build RUN apk update && \ apk add --update npm -RUN npm install --global yarn - COPY ./ /ocis/ WORKDIR /ocis/ocis @@ -20,8 +18,6 @@ RUN apk update && \ rm -rf /var/cache/apk/* && \ echo 'hosts: files dns' >| /etc/nsswitch.conf -RUN npm install --global yarn - LABEL maintainer="ownCloud GmbH " \ org.label-schema.name="ownCloud Infinite Scale" \ org.label-schema.vendor="ownCloud GmbH" \ diff --git a/accounts/Makefile b/accounts/Makefile index 28265c2934..1a0b8ac432 100644 --- a/accounts/Makefile +++ b/accounts/Makefile @@ -45,6 +45,7 @@ yarn-build: node_modules .PHONY: node_modules node_modules: + npm install --global yarn yarn install --frozen-lockfile ############ protobuf ############ diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index 7c8b57ad2a..4c991be436 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -27,6 +27,7 @@ ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this .PHONY: ci-node-generate ci-node-generate: + npm install --global yarn yarn install --frozen-lockfile .PHONY: pull-assets diff --git a/web/Makefile b/web/Makefile index a3a0452efc..43eb525d08 100644 --- a/web/Makefile +++ b/web/Makefile @@ -27,6 +27,7 @@ ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this .PHONY: ci-node-generate ci-node-generate: + npm install --global yarn yarn install --frozen-lockfile WEB_ASSETS_VERSION = v4.3.0