1
0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-14 01:57:32 +08:00

208 Commits

Author SHA1 Message Date
Marcos Nils
41d2b5f235 Add instance name to hash in URL (#77)
Fixes #7
2017-01-04 18:43:06 +02:00
Antonis Kalipetis
81280517bf Add visual state of New instance and Delete buttons (#75)
The buttons now get disabled when pressed and their text changes to the action being made.
If the action ends (either with success or failure), state is reverted to the normal one.

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2017-01-04 18:42:49 +02:00
Antonis Kalipetis
fd52a544d1 Add .editorconfig file for consistent styling (#76)
This should take effect when editors with [EditorConfig](http://editorconfig.org/) support are used.

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2017-01-03 19:47:04 +02:00
Antonis Kalipetis
1af2b3665f Update style.css to use terminal-container (#74)
* Update Xterm.js CSS to the latest version

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>

* Update style.css to use terminal-container

The `.terminal` class was messing around xterm.js CSS rules, resulting in the cursor never being in a focused state.

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2017-01-03 18:13:18 +02:00
Marcos Lilljedahl
aa7aba1d5e Update xterm.js 2017-01-02 16:19:52 -03:00
Marcos Lilljedahl
bfbe3abed5 Check that instance is present when setting ports 2016-12-29 14:10:21 -03:00
Marcos Lilljedahl
b48812b085 Apply apparmor profile if env variable is present 2016-12-28 14:40:19 -03:00
Marcos Nils
dea778440e Add TLS certificates for machine drivers (#73) 2016-12-27 18:53:50 +02:00
Marcos Lilljedahl
93740dc9f5 Add copy shortcuts 2016-12-24 13:52:15 -03:00
Marcos Nils
92aa3aa3f8 Fix ARGS env
Also move them to the bottom to avoid cache invalidation
2016-12-21 21:11:23 -03:00
Marcos Lilljedahl
440ba09061 Change detach keys so other programs like nano work
Fixes #52
2016-12-21 19:09:22 -03:00
Jonathan Leibiusky (@xetorthio)
6c651abfae Was not handling nil here 2016-12-18 09:05:16 -08:00
Jonathan Leibiusky
54045d02f6 Delete zombie sessions and instances (#71) 2016-12-17 12:48:15 -08:00
Jonathan Leibiusky (@xetorthio)
93226e30ff Fixes prometheus gauges
Fix session close. Now PWD gets disconnected from network before
deleting it.
2016-12-17 11:41:24 -08:00
Jonathan Leibiusky
70eaf37d4b Add metrics (#70)
* Add prometheus support to count sessions, instances and clientes over
time

* Track counters on server reload

* Change to gauges
2016-12-15 17:12:17 -08:00
Marcos Lilljedahl
946a8e1419 Add google analytics support 2016-12-15 11:31:05 -08:00
Marcos Lilljedahl
a4424be83e Update Dockerfile.dind to latest version 2016-12-15 04:05:54 -03:00
Jonathan Leibiusky
c0a4553a69 Merge pull request #68 from franela/show_swarm_ports
Show docker swarm used ports
2016-12-13 08:03:41 -06:00
Jonathan Leibiusky (@xetorthio)
69050373d7 Show docker swarm used ports 2016-12-13 08:02:48 -06:00
Kunal Kushwaha
a92d5ea882 Update readme with changes in Makefile. (#67)
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2016-12-13 12:19:21 +00:00
Marcos Nils
c0bbcf6274 Fix URL pattern display 2016-12-05 15:23:14 -03:00
Marcos Nils
3b826bd29d Update reverse proxy instructions. 2016-12-05 12:33:03 -03:00
Marcos Lilljedahl
a7811b4e33 Omit race conditions and update swarm info events 2016-12-02 10:29:41 -03:00
Marcos Nils
84da622775 Remove pointer in struct method to avoid concurrent modifications to the (#64) 2016-12-02 02:19:49 +02:00
Jonathan Leibiusky
b47eac47c0 Merge pull request #63 from franela/show_proxied_ports
Show instance published ports
2016-12-01 17:57:15 -03:00
Jonathan Leibiusky @xetorthio
77905f3fd8 Query DinD instances for running containers and list the published ports
so the user can reverse proxy to the instance/port easily.
2016-12-01 17:28:55 -03:00
Jonathan Leibiusky
afa47c0bfc Periodic tasks refactor (#62)
* Once every second the session run a list of periodic tasks on every
instance concurrently. We use these tasks to do things like:
- Collect mem and cpu stats
- Check if instance is part of a swarm cluster
- Broadcast information to connected clients
2016-12-01 15:57:30 -03:00
Marcos Nils
07fee4c1bf Fix module error. 2016-12-01 02:48:42 -03:00
Marcos Nils
17b21e6fc8 Update installation instructions 2016-12-01 02:30:31 -03:00
Marcos Lilljedahl
db03019b4e Remove unnecesarry deps 2016-11-30 18:55:31 -03:00
Marcos Lilljedahl
5742e03454 Disable recaptcha to use PWD locally 2016-11-30 15:22:51 -03:00
Alex Ellis
5eda323477 Enable use of override for session timeout in hours, fix captcha bypass bug. (#51)
* - Enable use of override for session timeout. This is more useful than having to hard-code and rebuild the code for the previous 4 hour limit. Just set environmental variable and start the app.
- Future work may involve breaking down into minutes, but this is a good minimum delivery to provide value to end-user/developer.

- Fixes bug in Captcha code by introducing new landing page. This is not a new go template, it's a separate HTML file because SRP - single reponsibility principle. Happy for this to be refacted after merging commit.

- Fix for including Docker 1.12 override has been removed for later PR.

* Merge

* Reinstate 'material' JS include'

* https for JS includes

* HTTPs for JS in bypass
2016-11-30 20:17:18 +02:00
Vincent De Smet
d3e20724e9 Add fancy bash prompt from orchestration workshop (#28)
* Add bash prompt

* remove curly braces

* Change shell from ash to bash

* Add inputrc for bash
2016-11-30 05:12:34 +02:00
Marcos Lilljedahl
6371ee665e Remove the necessity to have sudo to build 2016-11-29 11:37:12 -03:00
Marcos Lilljedahl
cbdc22d8a0 Remove unnecessary log line and change default dind image 2016-11-29 11:06:43 -03:00
Marcos Nils
5f51e2bcbd Merge pull request #59 from franela/swarm_info
Return swarm info to be displayed in the FE
2016-11-29 15:53:40 +02:00
Marcos Lilljedahl
10bdf3d5f2 Return swarm info to be displayed in the FE
This requires that PWD is working as a container in the same
network as all dinds

Add icons to swarmInfo
2016-11-29 10:52:55 -03:00
Marcos Nils
0f4aea4de3 Merge pull request #43 from franela/reverse_proxy
Add reverse proxy endpoint.
2016-11-23 19:09:00 +02:00
Jonathan Leibiusky @xetorthio
6af6f42721 Make regex more restrictive to allow the proxy to be more deterministic.
Make it to not depend on a specific TLD.
2016-11-23 11:52:59 -03:00
Jonathan Leibiusky @xetorthio
b4ce06fa20 Reuse the same proxy handler 2016-11-23 11:52:59 -03:00
Jonathan Leibiusky @xetorthio
122118b9df Allow to specify port, and remove session id.
So now the way to address a node is in the form of:
`ip10_0_1_9-9200.play-with-docker.com`
2016-11-23 11:52:59 -03:00
Jonathan Leibiusky @xetorthio
ec9d34ffda Add reverse proxy endpoint.
It works by using the Host of the request. When it receives something in
the form of: `<node>.<session>.play-with-docker.com` it does a reverse
proxy http request to `node`, validating that the `node` actually belongs
to the `session`.
If the node has a prefix `ip` and continues with a valid IP address
where the dots where replaces by underscores (like `ip10_0_0_1`) then it
will remove the `ip` prefix and and replace the underscores by dots, and
assume it is an ip address.
2016-11-23 11:52:59 -03:00
Jonathan Leibiusky
a85bb4a1d7 Merge pull request #57 from alexellis/port_cli
Introduce flag for TCP port
2016-11-23 11:06:06 -03:00
Alex Ellis
11f2f48ebe Introduce flag for TCP port 2016-11-23 08:58:08 +00:00
Marcos Lilljedahl
fc9e4962d3 Create folder structure 2016-11-22 15:23:58 -03:00
Marcos Nils
370bab5e27 Merge pull request #56 from akalipetis/hotfix-instance-name-rotation
Fix issue where instance name rotation was faulty
2016-11-22 15:19:25 +02:00
Marcos Nils
73d1ae94d8 Merge pull request #55 from akalipetis/hotfix-https
Make all CSS/JS links HTTPS
2016-11-22 15:17:22 +02:00
Marcos Nils
ccb44f91b6 Merge pull request #54 from akalipetis/hotfix-dockerfile-run
Create the `/app/pwd` directory, otherwise it crashes without a volume
2016-11-22 15:14:29 +02:00
Antonis Kalipetis
dd8f63363e
Fix issue where instance name rotation was faulty
Previously, if node2 was deleted in a node1, node2, node3 set, the next node creation would fail since it would always try to assign node3 as a name.
Now, the first available name is always assigned.

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2016-11-22 10:42:19 +02:00
Antonis Kalipetis
a2754057dd
Make all CSS/JS links HTTPS
This helps in making this work behind an HTTPS proxy

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2016-11-22 09:54:29 +02:00