зеркало из https://github.com/docker/kitematic.git
Do not package boot2docker iso
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
This commit is contained in:
Jeffrey Morgan
Родитель
e64ebb207b
Коммит
6e6b247221
30
Gruntfile.js
30
Gruntfile.js
|
|
@ -9,7 +9,6 @@ var DARWIN_DOCKER_URL = 'https://get.docker.com/builds/Darwin/x86_64/docker-' +
|
|||
var WINDOWS_DOCKER_MACHINE_URL = 'https://github.com/docker/machine/releases/download/v' + packagejson['docker-machine-version'] + '/docker-machine_windows-amd64.exe';
|
||||
var DARWIN_DOCKER_MACHINE_URL = 'https://github.com/docker/machine/releases/download/v' + packagejson['docker-machine-version'] + '/docker-machine_darwin-amd64';
|
||||
var DARWIN_COMPOSE_URL = 'https://github.com/docker/compose/releases/download/' + packagejson['docker-compose-version'] + '/docker-compose-Darwin-x86_64';
|
||||
var BOOT2DOCKER_ISO_URL = 'https://github.com/boot2docker/boot2docker/releases/download/v' + packagejson['docker-version'] + '/boot2docker.iso';
|
||||
|
||||
module.exports = function (grunt) {
|
||||
require('load-grunt-tasks')(grunt);
|
||||
|
|
@ -27,18 +26,6 @@ module.exports = function (grunt) {
|
|||
return match ? match[1] : null;
|
||||
};
|
||||
|
||||
grunt.registerTask('download-boot2docker-iso', 'Downloads provided boot2docker version', function () {
|
||||
try {
|
||||
var data = fs.readFileSync(path.join('resources', 'boot2docker.iso'), {encoding: 'utf-8'});
|
||||
var match = data.match(/Boot2Docker-v(\d+\.\d+\.\d+)/);
|
||||
if (match && match[1] !== packagejson['docker-version']) {
|
||||
grunt.task.run('curl:boot2docker-iso');
|
||||
}
|
||||
} catch (err) {
|
||||
grunt.task.run('curl:boot2docker-iso');
|
||||
}
|
||||
});
|
||||
|
||||
grunt.registerMultiTask('download-binary', 'Downloads binary unless version up to date', function () {
|
||||
var target = grunt.task.current.target;
|
||||
var done = this.async();
|
||||
|
|
@ -201,7 +188,7 @@ module.exports = function (grunt) {
|
|||
files: [{
|
||||
expand: true,
|
||||
cwd: 'resources',
|
||||
src: ['docker*', 'boot2docker.iso', 'ssh.exe', 'OPENSSH_LICENSE', 'msys-*'],
|
||||
src: ['docker*', 'ssh.exe', 'OPENSSH_LICENSE', 'msys-*'],
|
||||
dest: 'dist/' + BASENAME + '-win32/resources/resources/'
|
||||
}],
|
||||
options: {
|
||||
|
|
@ -212,7 +199,7 @@ module.exports = function (grunt) {
|
|||
files: [{
|
||||
expand: true,
|
||||
cwd: 'resources',
|
||||
src: ['docker*', 'boot2docker.iso', 'macsudo', 'terminal'],
|
||||
src: ['docker*', 'macsudo', 'terminal'],
|
||||
dest: '<%= OSX_FILENAME %>/Contents/Resources/resources/'
|
||||
}, {
|
||||
src: 'util/kitematic.icns',
|
||||
|
|
@ -244,10 +231,6 @@ module.exports = function (grunt) {
|
|||
'docker-compose': {
|
||||
src: DARWIN_COMPOSE_URL,
|
||||
dest: 'resources/docker-compose'
|
||||
},
|
||||
'boot2docker-iso': {
|
||||
src: BOOT2DOCKER_ISO_URL,
|
||||
dest: path.join('resources', 'boot2docker.iso')
|
||||
}
|
||||
},
|
||||
|
||||
|
|
@ -351,7 +334,6 @@ module.exports = function (grunt) {
|
|||
|
||||
clean: {
|
||||
release: ['build/', 'dist/', 'installer/'],
|
||||
isos: ['resources/boot2docker*']
|
||||
},
|
||||
|
||||
// livereload
|
||||
|
|
@ -379,15 +361,15 @@ module.exports = function (grunt) {
|
|||
});
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
grunt.registerTask('default', ['download-binary:docker', 'download-binary:docker-machine', 'download-boot2docker-iso', 'newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
|
||||
grunt.registerTask('default', ['download-binary:docker', 'download-binary:docker-machine', 'newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
|
||||
} else {
|
||||
grunt.registerTask('default', ['download-binary', 'download-boot2docker-iso', 'newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
|
||||
grunt.registerTask('default', ['download-binary', 'newer:babel', 'less', 'newer:copy:dev', 'shell:electron', 'watchChokidar']);
|
||||
}
|
||||
|
||||
if (process.platform === 'win32') {
|
||||
grunt.registerTask('release', ['clean:release', 'download-binary:docker', 'download-binary:docker-machine', 'download-boot2docker-iso', 'babel', 'less', 'copy:dev', 'electron:windows', 'copy:windows', 'rcedit:exes', 'prompt:create-windows-installer', 'create-windows-installer', 'rename:installer']);
|
||||
grunt.registerTask('release', ['clean:release', 'download-binary:docker', 'download-binary:docker-machine', 'less', 'copy:dev', 'electron:windows', 'copy:windows', 'rcedit:exes', 'prompt:create-windows-installer', 'create-windows-installer', 'rename:installer']);
|
||||
} else {
|
||||
grunt.registerTask('release', ['clean:release', 'download-binary', 'download-boot2docker-iso', 'babel', 'less', 'copy:dev', 'electron:osx', 'copy:osx', 'plistbuddy', 'shell:sign', 'shell:zip']);
|
||||
grunt.registerTask('release', ['clean:release', 'download-binary', 'babel', 'less', 'copy:dev', 'electron:osx', 'copy:osx', 'plistbuddy', 'shell:sign', 'shell:zip']);
|
||||
}
|
||||
|
||||
process.on('SIGINT', function () {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "Kitematic",
|
||||
"version": "0.8.0",
|
||||
"version": "0.8.0-rc1",
|
||||
"author": "Kitematic",
|
||||
"description": "Simple Docker Container management for Mac OS X.",
|
||||
"homepage": "https://kitematic.com/",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче