From d3b1d7efdb574b45a469f8695e5810b8f1115ef6 Mon Sep 17 00:00:00 2001 From: jkoberg Date: Tue, 19 Oct 2021 10:11:19 +0200 Subject: [PATCH] install yarn in dockerfile --- Dockerfile | 5 +++++ ocis/Makefile | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4c86cdad..1b31071e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM owncloudci/golang:1.17 as build RUN apk update && \ apk add --update npm +RUN npm install --global yarn + COPY ./ /ocis/ WORKDIR /ocis/ocis @@ -14,9 +16,12 @@ FROM alpine:3.13 RUN apk update && \ apk upgrade && \ apk add ca-certificates mailcap && \ + apk add --update npm && \ 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/ocis/Makefile b/ocis/Makefile index 393a97796..f61615e20 100644 --- a/ocis/Makefile +++ b/ocis/Makefile @@ -32,7 +32,6 @@ ci-go-generate: # CI runs ci-node-generate automatically before this target .PHONY: ci-node-generate ci-node-generate: - @npm install --global yarn @make -C ../accounts ci-node-generate @make -C ../graph-explorer ci-node-generate @make -C ../settings ci-node-generate