luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Add rsync so the ui can build again 

Also add back the init target to the ui-v2 makefile
This commit is contained in:
Matt Keeler 2018-06-15 14:44:14 -04:00
parent 9653a66f92
commit 3884d10de4
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-support/docker/Build-UI.dockerfile
View File

@ -6,7 +6,7 @@ ARG MAKE_VERSION=4.2.1-r0
ARG YARN_VERSION=1.7.0 ARG YARN_VERSION=1.7.0
RUN apk update && \ RUN apk update && \
apk add nodejs=${NODEJS_VERSION} nodejs-npm=${NODEJS_VERSION} make=${MAKE_VERSION} && \ apk add nodejs=${NODEJS_VERSION} nodejs-npm=${NODEJS_VERSION} make=${MAKE_VERSION} rsync && \
npm install --global yarn@${YARN_VERSION} && \ npm install --global yarn@${YARN_VERSION} && \
mkdir /consul-src mkdir /consul-src

3
ui-v2/GNUmakefile
View File

@ -7,6 +7,9 @@ dist:
yarn run build yarn run build
mv dist ../pkg/web_ui/v2 mv dist ../pkg/web_ui/v2
init:
yarn install
lint: lint:
yarn run lint:js yarn run lint:js
format: format: