mirror of
https://github.com/portainer/portainer.git
synced 2025-07-22 06:49:40 +02:00
* feat(edge): fix webconsole and agent deployment command * feat(edge): display agent features when connected to IoT endpoint * feat(edge): add -e CAP_HOST_MANAGEMENT=1 to agent command * feat(edge): add -v /:/host and --name portainer_agent_iot to agent command * style(endpoint-creation): refactor IoT agent to Edge agent * refactor(api): rename AgentIoTEnvironment to AgentEdgeEnvironment * refactor(api): rename AgentIoTEnvironment to AgentEdgeEnvironment * feat(endpoint-creation): update Edge agent deployment instructions * feat(edge): wip edge * feat(edge): refactor key creation * feat(edge): update deployment instructions * feat(home): update Edge agent endpoint item * feat(edge): support dynamic ports * feat(edge): support sleep/wake and snapshots * feat(edge): support offline mode * feat(edge): host job support for Edge endpoints * feat(edge): introduce STANDBY state * feat(edge): update Edge agent deployment command * feat(edge): introduce EDGE_ID support * feat(edge): update default inactivity interval to 5min * feat(edge): reload Edge schedules after restart * fix(edge): fix execution of endpoint job against an Edge endpoint * fix(edge): fix minor issues with scheduling UI/UX * feat(edge): introduce EdgeSchedule version management * feat(edge): switch back to REQUIRED state from ACTIVE on error * refactor(edge): remove comment * feat(edge): updated tunnel status management * feat(edge): fix flickering UI when accessing Edge endpoint from home view * feat(edge): remove STANDBY status * fix(edge): fix an issue with console and Swarm endpoint * fix(edge): fix an issue with stack deployment * fix(edge): reset timer when applying active status * feat(edge): add background ping for Edge endpoints * fix(edge): fix infinite loading loop after Edge endpoint connection failure * fix(home): fix an issue with merge * feat(api): remove SnapshotRaw from EndpointList response * feat(api): add pagination for EndpointList operation * feat(api): rename last_id query parameter to start * feat(api): implement filter for EndpointList operation * fix(edge): prevent a pointer issue after removing an active Edge endpoint * feat(home): front - endpoint backend pagination (#2990) * feat(home): endpoint pagination with backend * feat(api): remove default limit value * fix(endpoints): fix a minor issue with column span * fix(endpointgroup-create): fix an issue with endpoint group creation * feat(app): minor loading optimizations * refactor(api): small refactor of EndpointList operation * fix(home): fix minor loading text display issue * refactor(api): document bolt services functions * feat(home): minor optimization * fix(api): replace seek with index scanning for EndpointPaginated * fix(api): fix invalid starting index issue * fix(api): first implementation of working filter * fix(home): endpoints list keeps backend pagination when it needs to * fix(api): endpoint pagination doesn't drop the first item on pages >=2 anymore * fix(home): UI flickering on page/filter load/change * feat(auth): login spinner * feat(api): support searching in associated endpoint group data * refactor(api): remove unused API endpoint * refactor(api): remove comment * refactor(api): refactor proxy manager * feat(api): declare EndpointList params as optional * feat(api): support groupID filter on endpoints route * feat(api): add new API operations endpointGroupAddEndpoint and endpointGroupDeleteEndpoint * feat(edge): new icon for Edge agent endpoint * fix(edge): fix missing exec quick action * fix(edge): add loading indicator when connecting to Edge endpoint * feat(edge): disable service webhooks for Edge endpoints * feat(endpoints): backend pagination for endpoints view (#3004) * feat(edge): dynamic loading for stack migration feature * feat(edge): wordwrap edge key * feat(endpoint-groups): backend pagination support for create and edit * feat(endpoint-groups): debounce on filter for create/edit views * feat(endpoint-groups): filter assigned on create view * (endpoint-groups): unassigned endpoints edit view * refactor(endpoint-groups): code clean * feat(endpoint-groups): remove message for Unassigned group * refactor(websocket): minor refactor associated to Edge agent * feat(endpoint-group): enable backend pagination (#3017) * feat(api): support groupID filter on endpoints route * feat(api): add new API operations endpointGroupAddEndpoint and endpointGroupDeleteEndpoint * feat(endpoint-groups): backend pagination support for create and edit * feat(endpoint-groups): debounce on filter for create/edit views * feat(endpoint-groups): filter assigned on create view * (endpoint-groups): unassigned endpoints edit view * refactor(endpoint-groups): code clean * feat(endpoint-groups): remove message for Unassigned group * refactor(api): endpoint group endpoint association refactor * refactor(api): rename files and remove comments * refactor(api): remove usage of utils * refactor(api): optional parameters * Merge branch 'feat-endpoint-backend-pagination' into edge # Conflicts: # api/bolt/endpoint/endpoint.go # api/http/handler/endpointgroups/endpointgroup_update.go # api/http/handler/endpointgroups/handler.go # api/http/handler/endpoints/endpoint_list.go # app/portainer/services/api/endpointService.js * fix(api): fix default tunnel server credentials * feat(api): update endpointListOperation behavior and parameters * fix(api): fix interface declaration * feat(edge): support configurable Edge agent checkin interval * feat(edge): support dynamic tunnel credentials * feat(edge): update Edge agent deployment commands * style(edge): update Edge agent settings text * refactor(edge): remove unused credentials management methods * feat(edge): associate a remote addr to tunnel credentials * style(edge): update Edge endpoint icon * feat(edge): support encrypted tunnel credentials * fix(edge): fix invalid pointer cast * feat(bolt): decode endpoints with jsoniter * feat(edge): persist reverse tunnel keyseed * refactor(edge): minor refactor * feat(edge): update chisel library usage * refactor(endpoint): use controller function * feat(api): database migration to DBVersion 19 * refactor(api): refactor AddSchedule function * refactor(schedules): remove comment * refactor(api): remove comment * refactor(api): remove comment * feat(api): tunnel manager now only manage Edge endpoints * refactor(api): clean-up and clarification of the Edge service * refactor(api): clean-up and clarification of the Edge service * fix(api): fix an issue with Edge agent snapshots * refactor(api): add missing comments * refactor(api): update constant description * style(home): remove loading text on error * feat(endpoint): remove 15s timeout for ping request * style(home): display information about associated Edge endpoints * feat(home): redirect to endpoint details on click on unassociated Edge endpoint * feat(settings): remove 60s Edge poll frequency option
222 lines
5.9 KiB
JavaScript
222 lines
5.9 KiB
JavaScript
const webpackDevConfig = require('./webpack/webpack.develop');
|
|
const webpackProdConfig = require('./webpack/webpack.production');
|
|
var gruntfile_cfg = {};
|
|
var loadGruntTasks = require('load-grunt-tasks');
|
|
var os = require('os');
|
|
var arch = os.arch();
|
|
if (arch === 'x64') arch = 'amd64';
|
|
|
|
module.exports = function(grunt) {
|
|
loadGruntTasks(grunt, {
|
|
pattern: ['grunt-*', 'gruntify-*']
|
|
});
|
|
|
|
grunt.registerTask('default', ['eslint', 'build']);
|
|
|
|
grunt.registerTask('build-webapp', [
|
|
'config:prod',
|
|
'env:prod',
|
|
'clean:all',
|
|
'copy:templates',
|
|
'webpack:prod']);
|
|
|
|
grunt.registerTask('build', [
|
|
'config:dev',
|
|
'shell:buildBinary:linux:' + arch,
|
|
'shell:downloadDockerBinary:linux:' + arch,
|
|
'copy:templates',
|
|
'webpack:dev'
|
|
]);
|
|
|
|
grunt.registerTask('build-server', [
|
|
'shell:buildBinary:linux:' + arch,
|
|
'shell:downloadDockerBinary:linux:' + arch,
|
|
'copy:templates',
|
|
'shell:run:' + arch
|
|
]);
|
|
|
|
grunt.task.registerTask('release', 'release:<platform>:<arch>',
|
|
function (p = 'linux', a = arch) {
|
|
grunt.task.run([
|
|
'config:prod',
|
|
'env:prod',
|
|
'clean:all',
|
|
'copy:templates',
|
|
'shell:buildBinary:' + p + ':' + a,
|
|
'shell:downloadDockerBinary:' + p + ':' + a,
|
|
'webpack:prod'
|
|
]);
|
|
});
|
|
|
|
grunt.task.registerTask('devopsbuild', 'devopsbuild:<platform>:<arch>',
|
|
function(p, a) {
|
|
grunt.task.run([
|
|
'config:prod',
|
|
'env:prod',
|
|
'clean:all',
|
|
'copy:templates',
|
|
'shell:buildBinaryOnDevOps:' + p + ':' + a,
|
|
'shell:downloadDockerBinary:' + p + ':' + a,
|
|
'webpack:prod'
|
|
]);
|
|
});
|
|
|
|
grunt.registerTask('lint', ['eslint']);
|
|
grunt.registerTask('run-dev', ['build', 'shell:run', 'watch:build']);
|
|
grunt.registerTask('clear', ['clean:app']);
|
|
|
|
grunt.registerTask('run-dev', [
|
|
'config:dev',
|
|
'build-server',
|
|
'webpack:devWatch'
|
|
]);
|
|
grunt.registerTask('clear', ['clean:app']);
|
|
|
|
// Project configuration.
|
|
grunt.initConfig({
|
|
root: 'dist',
|
|
distdir: 'dist/public',
|
|
shippedDockerVersion: '18.09.3',
|
|
shippedDockerVersionWindows: '17.09.0-ce',
|
|
config: gruntfile_cfg.config,
|
|
src: gruntfile_cfg.src,
|
|
clean: gruntfile_cfg.clean,
|
|
eslint: gruntfile_cfg.eslint,
|
|
shell: gruntfile_cfg.shell,
|
|
copy: gruntfile_cfg.copy,
|
|
webpack: gruntfile_cfg.webpack,
|
|
env: gruntfile_cfg.env
|
|
});
|
|
};
|
|
|
|
/***/
|
|
|
|
gruntfile_cfg.env = {
|
|
dev: {
|
|
NODE_ENV: 'development'
|
|
},
|
|
prod: {
|
|
NODE_ENV: 'production'
|
|
}
|
|
};
|
|
|
|
gruntfile_cfg.webpack = {
|
|
dev: webpackDevConfig,
|
|
prod: webpackProdConfig,
|
|
devWatch: Object.assign({ watch: true }, webpackDevConfig)
|
|
};
|
|
|
|
gruntfile_cfg.config = {
|
|
dev: { options: { variables: { environment: 'development' } } },
|
|
prod: { options: { variables: { environment: 'production' } } }
|
|
};
|
|
|
|
gruntfile_cfg.src = {
|
|
js: ['app/**/__module.js', 'app/**/*.js', '!app/**/*.spec.js'],
|
|
jsTpl: ['<%= distdir %>/templates/**/*.js'],
|
|
html: ['index.html'],
|
|
tpl: ['app/**/*.html'],
|
|
css: ['assets/css/app.css', 'app/**/*.css']
|
|
};
|
|
|
|
gruntfile_cfg.clean = {
|
|
all: ['<%= root %>/*'],
|
|
app: [
|
|
'<%= distdir %>/*',
|
|
'!<%= distdir %>/../portainer*',
|
|
'!<%= distdir %>/../docker*'
|
|
],
|
|
tmpl: ['<%= distdir %>/templates'],
|
|
tmp: [
|
|
'<%= distdir %>/js/*',
|
|
'!<%= distdir %>/js/app.*.js',
|
|
'<%= distdir %>/css/*',
|
|
'!<%= distdir %>/css/app.*.css'
|
|
]
|
|
};
|
|
|
|
gruntfile_cfg.eslint = {
|
|
src: ['gruntfile.js', '<%= src.js %>'],
|
|
options: { configFile: '.eslintrc.yml' }
|
|
};
|
|
|
|
|
|
gruntfile_cfg.copy = {
|
|
templates: {
|
|
files: [
|
|
{
|
|
dest: '<%= root %>/',
|
|
src: 'templates.json',
|
|
cwd: ''
|
|
}
|
|
]
|
|
}
|
|
};
|
|
|
|
function shell_buildBinary(p, a) {
|
|
var binfile = 'dist/portainer';
|
|
if (p === 'linux') {
|
|
return [
|
|
'if [ -f ' + (binfile) + ' ]; then',
|
|
'echo "Portainer binary exists";',
|
|
'else',
|
|
'build/build_binary.sh ' + p + ' ' + a + ';',
|
|
'fi'
|
|
].join(' ');
|
|
} else {
|
|
return [
|
|
'powershell -Command "& {if (Get-Item -Path ' + binfile + '.exe -ErrorAction:SilentlyContinue) {',
|
|
'Write-Host "Portainer binary exists"',
|
|
'} else {',
|
|
'& ".\\build\\build_binary.ps1" -platform ' + p + ' -arch ' + a + '',
|
|
'}}"'
|
|
].join(' ');
|
|
}
|
|
}
|
|
|
|
function shell_buildBinaryOnDevOps(p, a) {
|
|
if (p === 'linux') {
|
|
return 'build/build_binary_devops.sh ' + p + ' ' + a + ';';
|
|
} else {
|
|
return 'powershell -Command ".\\build\\build_binary_devops.ps1 -platform ' + p + ' -arch ' + a + '"';
|
|
}
|
|
}
|
|
|
|
function shell_run() {
|
|
return [
|
|
'docker rm -f portainer',
|
|
'docker run -d -p 8000:8000 -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(';');
|
|
}
|
|
|
|
function shell_downloadDockerBinary(p, a) {
|
|
var ps = { 'windows': 'win', 'darwin': 'mac' };
|
|
var as = { 'amd64': 'x86_64', 'arm': 'armhf', 'arm64': 'aarch64' };
|
|
var ip = ((ps[p] === undefined) ? p : ps[p]);
|
|
var ia = ((as[a] === undefined) ? a : as[a]);
|
|
var binaryVersion = ((p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>'));
|
|
if (p === 'linux' || p === 'mac') {
|
|
return [
|
|
'if [ -f dist/docker ]; then',
|
|
'echo "Docker binary exists";',
|
|
'else',
|
|
'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';',
|
|
'fi'
|
|
].join(' ');
|
|
} else {
|
|
return [
|
|
'powershell -Command "& {if (Get-Item -Path dist/docker.exe -ErrorAction:SilentlyContinue) {',
|
|
'Write-Host "Docker binary exists"',
|
|
'} else {',
|
|
'& ".\\build\\download_docker_binary.ps1" -docker_version ' + binaryVersion + '',
|
|
'}}"'
|
|
].join(' ');
|
|
}
|
|
}
|
|
|
|
gruntfile_cfg.shell = {
|
|
buildBinary: { command: shell_buildBinary },
|
|
buildBinaryOnDevOps: { command: shell_buildBinaryOnDevOps },
|
|
run: { command: shell_run },
|
|
downloadDockerBinary: { command: shell_downloadDockerBinary }
|
|
};
|