Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

chore(build-system): make assets default relative, serve assets from assets/public (#1309)

Browse source
This commit is contained in:
1138-4EB 2017-10-26 11:17:45 +02:00 • committed by Anthony Lapenna
parent c4e75fc858
commit 34d40e4876
6 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gruntfile.js
View file

@ -57,7 +57,7 @@ module.exports = function (grunt) {
// Project configuration.
grunt.initConfig({
distdir: 'dist',
distdir: 'dist/public',
shippedDockerVersion: '17.09.0-ce',
pkg: grunt.file.readJSON('package.json'),
config: {
@ -72,8 +72,8 @@ module.exports = function (grunt) {
css: ['assets/css/app.css']
},
clean: {
all: ['<%= distdir %>/*'],
app: ['<%= distdir %>/*', '!<%= distdir %>/portainer*', '!<%= distdir %>/docker*'],
all: ['<%= distdir %>/../*'],
app: ['<%= distdir %>/*', '!<%= distdir %>/../portainer*', '!<%= distdir %>/../docker*'],
tmpl: ['<%= distdir %>/templates'],
tmp: ['<%= distdir %>/js/*', '!<%= distdir %>/js/app.*.js', '<%= distdir %>/css/*', '!<%= distdir %>/css/app.*.css']
},
@ -93,7 +93,8 @@ module.exports = function (grunt) {
release: {
src: '<%= src.html %>',
options: {
root: '<%= distdir %>'
root: '<%= distdir %>',
dest: '<%= distdir %>'
}
}
},
@ -187,7 +188,7 @@ module.exports = function (grunt) {
run: {
command: [
'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 -a /app'
'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'
].join(';')
},
downloadDockerBinary: {