Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00
Code Issues Releases Activity

feat(build-system): update build system (#2682)

Browse source
This commit is contained in:
Anthony Lapenna 2019-02-07 12:00:47 +13:00 • committed by GitHub
parent 9b6b6e09ae
commit fdc11dbe3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
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('run-dev', ['build', 'shell:run:' + arch, 'watch:build']);
grunt.registerTask('run-dev', ['build', 'shell:run', 'watch:build']);
grunt.registerTask('clear', ['clean:app']);
// 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) {
var binfile = 'dist/portainer-' + p + '-' + a;
var binfile = 'dist/portainer';
if (p === 'linux') {
return [
'if [ -f ' + (binfile) + ' ]; then',
@ -292,10 +292,10 @@ function shell_buildBinaryOnDevOps(p, a) {
}
}
function shell_run(arch) {
function shell_run() {
return [
'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(';');
}