Commit Graph

2137 Commits

Author SHA1 Message Date
Jeffrey Morgan 54a6caa855 Merge branch 'master' into hub-button 2015-04-10 16:35:28 -04:00
Jeffrey Morgan 33c8ca3ad0 Update README.md 2015-04-09 20:37:18 -04:00
Jeffrey Morgan d746a5a24f Update README.md 2015-04-09 20:37:02 -04:00
Jeffrey Morgan f140b870e5 Merge pull request #372 from kitematic/improve-logs
Fixes for log issues
2015-04-09 20:08:51 -04:00
Jeffrey Morgan bc4b37cffd Better log performance by capping at 3000 lines. Detach stream when log view is unmounted.
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-04-09 19:57:17 -04:00
Jeffrey Morgan 1b8bff01cc Update README.md 2015-04-08 16:26:20 -04:00
Jeffrey Morgan 5884b9201b Merge pull request #370 from kitematic/jeffdm-windows
Updating Windows Branch with latest changes
2015-04-08 10:20:43 -04:00
Jeffrey Morgan 5a0fd8db61 removing circle.yml 2015-04-07 21:13:27 -04:00
Jeffrey Morgan 159ea8013f Merge branch 'master' into jeffdm-windows
Conflicts:
	README.md
2015-04-07 21:01:53 -04:00
Jeffrey Morgan a5b003b381 Adding pull container feature 2015-04-07 16:06:08 -04:00
Jeffrey Morgan 9776f44d2c Merge pull request #364 from koddsson/master-fix-key-warning
Fall-back to image name as key when there is no id
2015-04-07 14:51:20 -04:00
Jeffrey Morgan d7dea0bcfa wip button
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-04-06 21:45:45 -04:00
Jeffrey Morgan 89d3728bda Removing console side 2015-04-06 14:19:47 -04:00
Jeffrey Morgan d277997cc9 Merge branch 'master' into hub-button 2015-04-06 14:17:14 -04:00
Jeffrey Morgan b6039efc76 Update README.md 2015-04-06 13:58:47 -04:00
Jeffrey Morgan 063e923065 Update .travis.yml 2015-04-06 13:58:11 -04:00
Jeffrey Morgan ec43f48537 Update .travis.yml 2015-04-06 13:49:31 -04:00
Jeffrey Morgan ce085a450a Merge branch 'master' of github.com:kitematic/kitematic 2015-04-06 13:46:52 -04:00
Jeffrey Morgan f730b5ebf2 adding travis ci 2015-04-06 13:46:46 -04:00
Jeffrey Morgan 4b96ac9bc9 Update circle.yml 2015-04-06 13:38:08 -04:00
Jeffrey Morgan 832ba18c02 Update README.md 2015-04-06 12:20:02 -04:00
Jeffrey Morgan e5975df7f1 Merge pull request #365 from kitematic/coverage
Adding code coverage
2015-04-06 12:14:06 -04:00
Jeffrey Dean Morgan be368f7a77 Adding code coverage to unit tests
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2015-04-06 12:13:05 -04:00
Kristján Oddsson 7482077975 Change variable from snake_case to camelCase.
Signed-off-by: Kristján Oddsson <koddsson@gmail.com>
2015-04-06 15:36:26 +00:00
Jeffrey Morgan d94f9d325f Merge pull request #363 from koddsson/master-update-tags-on-mount
Update tags on mounting ImageCard component.
2015-04-06 11:31:33 -04:00
Kristján Oddsson 6e56c4f665 Change normal function in to a ES6 arrow function.
No need for `.bind(this)` with ECMAScript6 syntax!

Signed-off-by: Kristján Oddsson <koddsson@gmail.com>
2015-04-05 21:12:13 +00:00
Kristján Oddsson 603b9c5952 Fetch tags when a Image card has been mounted.
For images that don't have a "latest" tag (such as `google/debian`) we
fetch all the tags when the `ImageCard` component mounts and set the
chosen tag to the first one in the list (so far it seems to be the
latest tag where such a tag exists but we can add some logic here to
choose a appropriate tag if we want).

Signed-off-by: Kristján Oddsson <koddsson@gmail.com>
2015-04-05 17:08:12 +00:00
Kristján Oddsson 9eab0501fd Format the error message a little bit better.
The error message is actually a object and not a string so we format it
a bit better with this patch.

Signed-off-by: Kristján Oddsson <koddsson@gmail.com>
2015-04-05 17:07:54 +00:00
Kristján Oddsson dfe80af6e4 Fall-back to image name as key when there is no id
When a container is first started and the image is downloading there is
no id set. With this patch we'll check if the container has a id and
and is downloading, if so we'll substitute it with the image name and
render such.

This will fix the react key props warning in the developer console as
well as maybe give us some sort of performance boost(?)

Signed-off-by: Kristján Oddsson <koddsson@gmail.com>
2015-04-05 17:05:45 +00:00
Jeffrey Morgan b67c1a912e Update README.md 2015-04-04 17:24:18 -04:00
Jeffrey Morgan 8e66b7b949 Merge pull request #359 from koddsson/master-fix-scratch-run-message
Replace hard-coded error message with props.
2015-04-04 16:25:01 -04:00
Kristján Oddsson 584c795512 Replace hard-coded error message with props.
Make sure that errors that happen when pulling image layers bubble up to
the UI. We do this by catching errors coming from the docker client,
calling the callback with that error and setting the global variable
`_error` as the error we just caught. This is to make sure that when the
stream ends we call the callback with the error as well as to not to
over-ride it.

Finally we remove the hard-coded message in the UI and display the error
that gets passed in to it through the props attribute. This is the only
part I'm not super sure on if we really want since it must have been set
there for a reason. If I can get a re-producible test case I can make
sure that it's still passing with this patch.

Fixes #355.

Signed-off-by: Kristján Oddsson <koddsson@gmail.com>
2015-04-03 20:15:39 +00:00
Jeffrey Morgan f063346e02 Merge pull request #356 from koddsson/master-remove-container-call-on-hover
Remove `componentDidMount` function with reload.
2015-04-03 13:03:21 -04:00
Jeffrey Morgan b5acaafd9e Update README.md 2015-04-03 10:58:14 -04:00
Kristján Oddsson d92a102a83 Remove `componentDidMount` function with reload.
Removing the reload (and the whole `componentDidMount` function since
the reload was the only thing in there) makes sure that the container
view isn't reloaded when the DOM changes and so does not make a request
to the container. Because of this change kitematic will not make a
request to the container when hovering over the preference button.

(I wasn't sure if this was used somewhere for real. If it is, I couldn't
find it).

Fixes #333.

Signed-off-by: Kristján Oddsson <koddsson@gmail.com>
2015-04-02 10:09:30 +00:00
Jeffrey Morgan 97272b971f Fix any mac errors due to windows changes 2015-03-31 18:31:35 -04:00
Jeffrey Morgan 9583791a18 Merge branch 'master' into jeffdm-windows
Conflicts:
	package.json
	src/ContainerHomeFolders.react.js
	src/ContainerStore.js
2015-03-31 18:17:50 -04:00
Jeffrey Morgan 246affabd4 bumping version to 0.5.13 2015-03-31 13:29:26 -04:00
Jeffrey Morgan 29482533af Merge pull request #352 from ninuxio/update_readme_win
Modify OS list
2015-03-31 12:04:00 -04:00
Nicolas Bonaldi f0a1aa463d Modify OS list 2015-03-31 18:02:46 +02:00
Jeffrey Morgan bcf66d7a11 Merge pull request #339 from domderen/win_client
Win client
2015-03-31 11:36:16 -04:00
Dominik Deren 046e640eeb - Working on changes required to setup client on windows.
- For now changes in SetupStore are made, to skip steps that do MacOS setup.
- Adding deps.ps1 script for installing all required dependencies on windows.
- Adding reset.ps1 script for removing all dependencies on windows.
- Modifying files to work with windows dependencies
- Fix for duplicate react instances in the code.
- A fix required to load only one instance of React in the application. Without such fix, on windows application loads two instances of React at start time, and crashes.
- Modifying files to support windows paths
- Modifying deps and reset powershell scripts to loose chocolatey dependency. Adding windows VirtualBox installation steps.
- Improved a workaround for adding Users directory to the shared folder in the VM on windows. Added few more fixes for Windows/Mac compatibility.
- Removing unnecessary log from deps.ps1 script,
- Updating Gulpfile to download and copy all the dependencies on application start,
- Cleaning pre and post install scripts from package.json, as they are not realy friendly for different platforms.
- Removing changes from browser.js as they were not necessary or even breaking.
- Cleaning pre and post install scripts from package.json, as they are not really friendly for different platforms.
- Fixing changes in package.json.
- Fixed reset.ps1 file to delete all folders created by the app,
- Fixed metrics.js file to properly use userAgent depending on the OS.
- Uncommented updateBinaries line in SetupStore.
- Adding open as a dependency.
- Fixing the setupStore tests.
- Adding proper directory to PATH for docker and docker-machine binaries.
- Adding support for the docker terminal command. It opens a CMD on windows and sets required env variables for the docker to work. Docker and Docker-Machine should be on the path, as they are set up there on Kitematic startup.
- Added Resources module which provides paths to all files stored in the resources directory,
- Added docker and docker-machine binary paths to Util module, to have a single place for calling those paths,
- Added binaries directory path, to Util module, to have a single place for calling this path,
- Added another exec command, which utilizes "child_process" module, and it's "exec" command, as the "exec" used right now is deprecated,
- Refactored the Installation step in the SetupStore, and connected with that SetupUtil commands to perform copying binaries from node instead of bash commands. That way application is more cross-platform friendly,
- Added new dependencies in form of fs-extra, fs-promise and any-promise, to allow yielding of fs commands in SetupUtil.
- The setup process now works correctly on windows from the beginning to end.
- Fixing broken tests.
- Improving tests.
- Adding elevated permissions to the reset script, as it is required to kill processes and remove VirtualBox.
- Added ability to run reset scripts through gulp,
- Added new npm script for resetting the environment "npm run reset".
- Refactored docker-machine module, to use Resources module for finding the machine command and general code cleaning,
- Added windows keyboard shortcut support.
- Adding the use of Resources module, instead of direct access of files in the resources dir.
- Testing appveyor.
- Testing appveyor + io.js.
- Back to node 0.10.
- Fixing permission issues with appveyor.
- Testing travis.

Signed-off-by: Dominik Deren <dominik.deren@live.com>

- Working on changes required to setup client on windows.
- For now changes in SetupStore are made, to skip steps that do MacOS setup.

- Adding deps.ps1 script for installing all required dependencies on windows.
- Adding reset.ps1 script for removing all dependencies on windows.

Fix for duplicate react instances in the code.

Modifying files to support windows paths

- Removing unnecessary log from deps.ps1 script,
- Updating Gulpfile to download and copy all the dependencies on application start,
- Cleaning pre and post install scripts from package.json, as they are not realy friendly for different platforms.
- Removing changes from browser.js as they were not necessary or even breaking.

- Fixing changes in package.json.

- Uncommented updateBinaries line in SetupStore.

- Adding open as a dependency.

- Adding proper directory to PATH for docker and docker-machine binaries.

- Fixing broken tests.

- Improving tests.

- Adding elevated permissions to the reset script, as it is required to kill processes and remove VirtualBox.

- Added ability to run reset scripts through gulp,
- Added new npm script for resetting the environment "npm run reset".

- Refactored docker-machine module, to use Resources module for finding the machine command and general code cleaning,
- Added windows keyboard shortcut support.

- Adding the use of Resources module, instead of direct access of files in the resources dir.

- Testing appveyor + io.js.

- Back to node 0.10.

- Fixing permission issues with appveyor.

Signed-off-by: Dominik Deren <dominik.deren@live.com>
2015-03-31 16:20:35 +01:00
Jeffrey Morgan 0f697914b1 Merge pull request #346 from kitematic/bump-virtualbox
Bump Virtualbox Version
2015-03-29 16:40:52 -04:00
Jeffrey Morgan 2565493975 Bumping version in package.json 2015-03-29 16:38:30 -04:00
Jeffrey Morgan 39d999b635 Bump Virtualbox Version 2015-03-29 16:24:47 -04:00
Jeffrey Morgan ffdc9d3019 Update CONTRIBUTING.md 2015-03-29 14:19:08 -04:00
Jeffrey Morgan f4307531a0 Merge branch 'click-repo-open-hub-sitepage' of https://github.com/allen-servedio/kitematic 2015-03-28 21:54:20 -04:00
Allen Servedio c51a2bdce6 Missed updating one tool tip. 2015-03-28 21:48:18 -04:00
Jeffrey Morgan e81371d2b7 Merge pull request #281 from allen-servedio/click-repo-open-hub-sitepage
Altering the repo name to be a link that takes you to the Docker Hub page
2015-03-28 21:43:37 -04:00
Allen Servedio 1b8e25501c Changes made in response to code review. 2015-03-28 21:34:22 -04:00