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

Merge branch 'develop' into oath-poc

pull/2749/head
Anthony Lapenna 2019-02-08 13:32:53 +13:00
parent 2755527d28 fdc11dbe3a
commit af34b99cd4
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gruntfile.js
View File

@ -56,7 +56,7 @@ module.exports = function(grunt) {
}); });
grunt.registerTask('lint', ['eslint']); grunt.registerTask('lint', ['eslint']);
grunt.registerTask('run-dev', ['build', 'shell:run:' + arch, 'watch:build']); grunt.registerTask('run-dev', ['build', 'shell:run', 'watch:build']);
grunt.registerTask('clear', ['clean:app']); grunt.registerTask('clear', ['clean:app']);
// Load content of `vendor.yml` to src.jsVendor, src.cssVendor and src.angularVendor // Load content of `vendor.yml` to src.jsVendor, src.cssVendor and src.angularVendor
@ -264,7 +264,7 @@ gruntfile_cfg.replace = {
}; };
function shell_buildBinary(p, a) { function shell_buildBinary(p, a) {
var binfile = 'dist/portainer-' + p + '-' + a; var binfile = 'dist/portainer';
if (p === 'linux') { if (p === 'linux') {
return [ return [
'if [ -f ' + (binfile) + ' ]; then', 'if [ -f ' + (binfile) + ' ]; then',
@ -292,10 +292,10 @@ function shell_buildBinaryOnDevOps(p, a) {
} }
} }
function shell_run(arch) { function shell_run() {
return [ return [
'docker rm -f portainer', 'docker rm -f portainer',
'docker run -d -p 9000:9000 -v $(pwd)/dist:/app -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock:z --name portainer portainer/base /app/portainer-linux-' + arch + ' --no-analytics --template-file /app/templates.json' 'docker run -d -p 9000:9000 -v $(pwd)/dist:/app -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock:z --name portainer portainer/base /app/portainer --no-analytics --template-file /app/templates.json'
].join(';'); ].join(';');
} }

5
package.json
View File

@ -20,12 +20,11 @@
} }
], ],
"scripts": { "scripts": {
"grunt": "grunt",
"start": "grunt run-dev", "start": "grunt run-dev",
"start:server": "yarn build:server:offline && grunt shell:run:amd64", "start:server": "yarn build:server:offline && grunt shell:run",
"clean:all": "grunt clean:all", "clean:all": "grunt clean:all",
"build": "grunt build", "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" "build:server:offline": "cd ./api/cmd/portainer && CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' && mv -f portainer ../../../dist/portainer"
}, },
"engines": { "engines": {
"node": ">= 0.8.4" "node": ">= 0.8.4"