bundle:/element-web install yarn from npm instead of apt
This commit is contained in:
parent
ea73de81e5
commit
3c5e778016
2 changed files with 2 additions and 3 deletions
|
@ -29,9 +29,9 @@ files = {
|
||||||
|
|
||||||
actions = {
|
actions = {
|
||||||
'element-web_yarn': {
|
'element-web_yarn': {
|
||||||
'command': 'cd ' + element_web_root + ' && yarn install && yarn build',
|
'command': 'cd ' + element_web_root + ' && npm install yarn && node_modules/yarn/bin/yarn install && node_modules/yarn/bin/yarn build',
|
||||||
'needs': {
|
'needs': {
|
||||||
'pkg_apt:yarn',
|
'pkg_apt:nodejs',
|
||||||
},
|
},
|
||||||
'triggered': True,
|
'triggered': True,
|
||||||
},
|
},
|
||||||
|
|
|
@ -7,7 +7,6 @@ def nginx_config(metadata):
|
||||||
'vhosts': {
|
'vhosts': {
|
||||||
metadata.get('element-web/url'): {
|
metadata.get('element-web/url'): {
|
||||||
'webroot': '/var/www/{}/webapp/'.format(metadata.get('element-web/url')),
|
'webroot': '/var/www/{}/webapp/'.format(metadata.get('element-web/url')),
|
||||||
'extras': True,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue