docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix small windows installer bugs

This commit is contained in:
Jeffrey Morgan 2015-06-18 11:38:34 -07:00
parent 11739f0eac
commit 98873e4c5d
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Gruntfile.js
View File

@ -64,7 +64,7 @@ module.exports = function (grunt) {
electron: { electron: {
windows: { windows: {
options: { options: {
name: APPNAME, name: BASENAME,
dir: 'build/', dir: 'build/',
out: 'dist/', out: 'dist/',
version: packagejson['electron-version'], version: packagejson['electron-version'],
@ -92,20 +92,20 @@ module.exports = function (grunt) {
exes: { exes: {
files: [{ files: [{
expand: true, expand: true,
cwd: 'dist/' + APPNAME + '-win32', cwd: 'dist/' + BASENAME + '-win32',
src: [APPNAME + '.exe'] src: [BASENAME + '.exe']
}], }],
options: { options: {
icon: 'util/kitematic.ico', icon: 'util/kitematic.ico',
'file-version': packagejson.version, 'file-version': packagejson.version,
'product-version': packagejson.version, 'product-version': packagejson.version,
'version-string': { 'version-string': {
'CompanyName': 'Docker, Inc', 'CompanyName': 'Docker Inc',
'ProductVersion': packagejson.version, 'ProductVersion': packagejson.version,
'ProductName': APPNAME, 'ProductName': APPNAME,
'FileDescription': APPNAME, 'FileDescription': APPNAME,
'InternalName': APPNAME + '.exe', 'InternalName': BASENAME + '.exe',
'OriginalFilename': APPNAME + '.exe', 'OriginalFilename': BASENAME + '.exe',
'LegalCopyright': 'Copyright 2015 Docker Inc. All rights reserved.' 'LegalCopyright': 'Copyright 2015 Docker Inc. All rights reserved.'
} }
} }
@ -113,16 +113,15 @@ module.exports = function (grunt) {
}, },
'create-windows-installer': { 'create-windows-installer': {
appDirectory: 'dist/' + APPNAME + '-win32/', appDirectory: 'dist/' + BASENAME + '-win32/',
authors: 'Docker Inc.', authors: 'Docker Inc.',
loadingGif: 'util/loading.gif', loadingGif: 'util/loading.gif',
setupIcon: 'util/kitematic.ico', setupIcon: 'util/kitematic.ico',
description: APPNAME, description: APPNAME,
title: APPNAME, title: APPNAME,
exe: APPNAME + '.exe', exe: BASENAME + '.exe',
version: packagejson.version, version: packagejson.version,
certificateFile: certificateFile, signWithParams: '/f ' + certificateFile + ' /p ' + certificatePassword + ' /tr http://timestamp.comodoca.com/rfc3161'
certificatePassword: certificatePassword
}, },
// docker binaries // docker binaries
@ -169,7 +168,7 @@ module.exports = function (grunt) {
expand: true, expand: true,
cwd: 'resources', cwd: 'resources',
src: ['docker*', 'boot2docker.iso', 'ssh.exe', 'OPENSSH_LICENSE', 'msys-*'], src: ['docker*', 'boot2docker.iso', 'ssh.exe', 'OPENSSH_LICENSE', 'msys-*'],
dest: 'dist/' + APPNAME + '-win32/resources/resources/' dest: 'dist/' + BASENAME + '-win32/resources/resources/'
}], }],
options: { options: {
mode: true mode: true

2
package.json
View File

@ -27,7 +27,7 @@
"docker-version": "1.6.2", "docker-version": "1.6.2",
"docker-machine-version": "0.3.0-rc3", "docker-machine-version": "0.3.0-rc3",
"docker-compose-version": "1.2.0", "docker-compose-version": "1.2.0",
"electron-version": "0.28.2", "electron-version": "0.27.2",
"virtualbox-version": "4.3.28", "virtualbox-version": "4.3.28",
"virtualbox-filename": "VirtualBox-4.3.28.pkg", "virtualbox-filename": "VirtualBox-4.3.28.pkg",
"virtualbox-filename-win": "VirtualBox-4.3.28.exe", "virtualbox-filename-win": "VirtualBox-4.3.28.exe",