Skip to content

Commit

Permalink
Increase version number to 0.17.10 and Mergel Pull request. Adding Fixes
Browse files Browse the repository at this point in the history
Merges Pull Request: docker#3462 .. docker#3692 .. docker#4401 .. docker#5306

They are Fix Login. and adding stuff.

temporarily simplifying the building. and remove the test.

add building on TC with tag. and pushing release to github.
  • Loading branch information
Trackhe committed Sep 28, 2019
1 parent 2ce6482 commit ea9c7d8
Show file tree
Hide file tree
Showing 236 changed files with 588 additions and 462 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ settings.json

# IDEs
.idea

# Build Files
39 changes: 28 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
os: osx
sudo: false

language: node_js
node_js:
- "6"
- "8"
- "10"

- '10'
- '12'
before_script:
- brew install fakeroot
- brew install dpkg
- brew install rpm
- brew install wine
- npm install -g grunt-cli
- npm install electron-installer-debian
- npm install electron-installer-dmg
- npm install electron-forge
cache:
directories:
- node_modules

- node_modules
install: npm i
script:
- npm install
- npm test

install: npm i
- grunt
deploy:
provider: releases
api_key:
secure: j1InOUFsxYAMiNEERC1/KYXcC/DsfvpSlCnVTlU4yLwg7wjpb9ENYgwYQRYy58a+wA4uI08ar8jKwjEAuHhqhYqD3ztRkYGWKccGpEbMTAaGqP9JRLSP5awJUw4/VSCE/Swq7odalmWPA1JZC6+8n6ZOaLOpxJWxDm7SQnF6iQIuTIwtGrg1PeOSh1drMSYRDGC5m8dpY9Jc/EoCPEThYU+RoDqg98yPLxfKKmWAFG0iS5lAHbIZ7MGWr5g2snMRUzD7TC/BFxA/Za5i+uyxKEr4CZBXE7HqXL5qUqAlItGDDh7ioSicDhV/8y8JxbAN/RnXnevswbzY2+GD2dkjDwEDnSJ/ajJekCr3DYInMvSDGMpGpEEzcxZ1rlVZ+LPklfMyKWnOkd2M2rooPQmlaplWo6zIm/8MLETqMsO57F3W9rOcOKs+ojvIMnhPyfDubji9WI/4cR6oq+1UnBp296EYrnl6VKmewt/5+wDzKMfdxChqdvsb8hK5gVLeI9xOh/bTEdNquTsEk2G64e/HgHz35Qxv/2rXW1xUCYoiNQ1T/u2ZwHn7dUnNpZXx5b2ueT12LaWQP9YEjoaz/iYDfQOw3/X/m3Yap1gPQG9nM1leBMkexFOvGHzdxujBM4sjImnEzGE85Dp6+0TDgf5nv1JrMoHMCQT5EmJQHb329mY=
file:
- release/Kitematic-0.17.10-Mac.zip
- release/Kitematic-0.17.10-Debian-Ubuntu.zip
- release/Kitematic-0.17.10-Windows.zip
skip_cleanup: true
on:
tags: true
all_branches: true
repo: Trackhe/kitematic
Empty file modified CONTRIBUTING.md
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions Gruntfile.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ module.exports = function (grunt) {
},
debian: {
options: {
archive: './release/' + VERSION_FILENAME + '-Ubuntu.zip',
archive: './release/' + VERSION_FILENAME + '-Debian-Ubuntu.zip',
mode: 'zip',
},
files: [{
Expand Down Expand Up @@ -385,7 +385,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-electron-installer-redhat');

grunt.registerTask('build', ['newer:babel', 'less', 'newer:copy:dev']);
grunt.registerTask('default', ['build', 'shell:electron', 'watch']);
grunt.registerTask('default', ['release:debian:x64', 'release:mac', 'release:windows']);

grunt.registerTask('release:linux', [
'clean:release', 'build', 'shell:linux_npm',
Expand Down
Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified MAINTAINERS
100644 → 100755
Empty file.
Empty file modified Makefile
100644 → 100755
Empty file.
33 changes: 5 additions & 28 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,58 +1,35 @@
[![Build Status](https://travis-ci.org/docker/kitematic.svg?branch=master)](https://travis-ci.org/docker/kitematic)


[![Kitematic Logo](https://cloud.githubusercontent.com/assets/251292/5269258/1b229c3c-7a2f-11e4-96f1-e7baf3c86d73.png)](https://kitematic.com)

Kitematic is a simple application for managing Docker containers on Mac, Linux and Windows.

![Kitematic Screenshot](https://cloud.githubusercontent.com/assets/251292/8246120/d3ab271a-15ed-11e5-8736-9a730a27c79a.png)

## Installing Kitematic

[Download the latest version](https://github.com/docker/kitematic/releases) of Kitematic via the github release page.
[Download the latest version](https://github.com/Trackhe/kitematic/releases) of Kitematic via the github release page.

## Documentation

Kitematic's documentation and other information can be found at [http://kitematic.com/docs](http://kitematic.com/docs).

## Security Disclosure

Security is very important to us. If you have any issue regarding security, please disclose the information responsibly by sending an email to security@docker.com and not by creating a github issue.
[Security Disclosure](https://github.com/docker/kitematic/blob/master/README.md).

## Bugs and Feature Requests

Have a bug or a feature request? Please first read the [Issue Guidelines](https://github.com/kitematic/kitematic/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/kitematic/kitematic/issues/new).
Have a bug or a feature request? Please first read the [Issue Guidelines](https://github.com/trackhe/kitematic/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/trackhe/kitematic/issues/new).

## Roadmap & Contributing

We welcome all pull requests and contributions that anyone would like to make. The Kitematic team is super happy to support anyone who wants to get involved. Please checkout our [roadmap](ROADMAP.md) that we keep up to date for ideas to help you with contributing. We would love to talk to you about contributing.
We REALLY welcome all pull requests and contributions that anyone would like to make.

Please read through our [Contributing Guidelines](https://github.com/kitematic/kitematic/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.

## Community

- [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kitematic/kitematic?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
- Ask questions on our [user forum](https://forums.docker.com/c/open-source-projects/kitematic).
- **#kitematic** on IRC. [Join the channel](http://webchat.freenode.net/?channels=%23kitematic&uio=d4).
- Follow [@kitematic on Twitter](https://twitter.com/kitematic).

## Uninstalling

**Mac**

- Remove Kitematic.app
- Remove any unwanted Virtual Machines in VirtualBox
```bash
# remove app data
rm -rf ~/Library/Application\ Support/Kitematic
```

**Windows**

Open `Programs and Features` from `Control Panel`

- Uninstall Kitematic
- Uninstall Oracle VM VirtualBox
- Follow [@kitematic](https://github.com/docker/kitematic).

## Copyright and License

Expand Down
Empty file modified ROADMAP.md
100644 → 100755
Empty file.
Empty file modified __integration__/HubUtil-integration.js
100644 → 100755
Empty file.
Empty file modified __integration__/RegHubUtil-integration.js
100644 → 100755
Empty file.
Empty file modified __mocks__/app.js
100644 → 100755
Empty file.
Empty file modified __mocks__/electron.js
100644 → 100755
Empty file.
Empty file modified __mocks__/remote.js
100644 → 100755
Empty file.
Empty file modified __tests__/Util-test.js
100644 → 100755
Empty file.
Empty file modified docs/README.md
100644 → 100755
Empty file.
Empty file modified electron-builder.json
100644 → 100755
Empty file.
Empty file modified fonts/kitematic.eot
100644 → 100755
Empty file.
Empty file modified fonts/kitematic.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified fonts/kitematic.ttf
100644 → 100755
Empty file.
Empty file modified fonts/kitematic.woff
100644 → 100755
Empty file.
Empty file modified images/boot2docker.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/button-restart.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/button-start.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/button-stop.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/button-terminal.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/button-view.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/cartoon-docker-compose.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/cartoon-docker-machine.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/cartoon-docker.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/cartoon-kitematic.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/close.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/connect-art.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/[email protected]
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified images/connect-to-hub.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/container-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/container.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/downloading-arrow-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/downloading-arrow.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/downloading-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/downloading.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/error.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/feedback.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/folder.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/fullscreen.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/fullscreenclose.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/inspection.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/install-error.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/loading-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/loading.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/logo-active.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/logo.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/minimize.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/official.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/paused.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/preferences.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/private.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/restarting.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/running-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/running.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/runningwave-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/runningwave.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/still-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/stopped-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/stopped.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/user.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/userdropdown.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/virtualbox.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/wavy-white.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/whaleicon.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/windows-close.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/windows-fullscreen.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/windows-fullscreenclose.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified images/windows-minimize.png
100644 → 100755
Empty file modified images/[email protected]
100644 → 100755
Empty file modified index.html
100644 → 100755
Empty file.
Empty file modified jest-integration.json
100644 → 100755
Empty file.
Empty file modified jest-unit.json
100644 → 100755
Empty file.
Loading

0 comments on commit ea9c7d8

Please sign in to comment.