github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' into webpack

pull/2670/head
Chaim Lev-Ari 2018-11-29 09:42:10 +02:00
parent 9d8bf5df63 34b886d690
commit 8fd6891cd6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package.json
View File

@ -21,11 +21,12 @@
],
"scripts": {
"grunt": "grunt",
"dev": "yarn grunt run-dev",
"clean-all": "yarn grunt clean:all",
"dev:client": "webpack",
"build:client": "webpack -p --config ./webpack/webpack.production.js",
"build-offline": "cd ./api/cmd/portainer && CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' && mv -b portainer ../../../dist/portainer-linux-amd64"
"start": "grunt run-dev",
"start:client": "webpack",
"start:server": "yarn build:server:offline && grunt shell:run:amd64",
"clean:all": "grunt clean:all",
"build": "grunt build",
"build:server:offline": "cd ./api/cmd/portainer && CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' && mv -f portainer ../../../dist/portainer-linux-amd64"
},
"engines": {
"node": ">= 0.8.4"