1
0
mirror of https://github.com/bingohuang/docker-labs.git synced 2025-07-13 17:42:53 +08:00

245 Commits

Author SHA1 Message Date
Marcos Nils
4dc98cc252 Merge pull request #39 from jpetazzo/master
Various improvements for the DinD image
2016-11-21 03:38:18 +02:00
Marcos Nils
4d16285fac Merge pull request #45 from franela/stats
Show cpu and memory stats of every node
2016-11-21 02:45:56 +02:00
Jérôme Petazzoni
130f9c8403 Update Dockerfile.dind 2016-11-18 15:53:36 -08:00
Jonathan Leibiusky @xetorthio
8b0749a9ba Show cpu and memory stats of every node 2016-11-18 13:52:47 -03:00
Jonathan Leibiusky
bc7dbead33 Merge pull request #44 from akalipetis/hotfix-xterm
Fix race conditions when initially resizing terminal
2016-11-18 09:20:46 -03:00
Antonis Kalipetis
7628864058
Fix race conditions when initially resizing terminal
Race conditions could happen if the Terminal container did not have the correct size during initialization.

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
2016-11-18 12:48:49 +02:00
Jonathan Leibiusky @xetorthio
5aa6f52292 Also update hostname of new instances 2016-11-17 17:36:59 -03:00
Marcos Lilljedahl
0f3c3c254a Add supergrok instructions 2016-11-17 12:34:48 -03:00
Jonathan Leibiusky @xetorthio
6d4c1e7e15 Remove unsed lib 2016-11-16 18:19:57 -03:00
Marcos Nils
316ff39821 Revert ngrok instance 2016-11-16 16:37:50 -03:00
Marcos Nils
c12c506953 Merge pull request #40 from franela/recaptcha_disable
Allow to disable recaptcha explicitly by env variable
2016-11-16 20:45:35 +02:00
Jonathan Leibiusky
e45700c904 Merge pull request #38 from franela/server-disconnected-alert
Show a server disconnected message
2016-11-16 09:36:45 -03:00
Jonathan Leibiusky @xetorthio
50943ce516 Show a server disconnected message when user is not able to connect to
server.
2016-11-16 09:35:43 -03:00
Marcos Lilljedahl
a10f247812 Allow to disable recaptcha explicitly by env variable
The reason for this is because sometimes in dev enviroments recaptcha
will might return a wrong answer, so it's nice to have a way to
explicitly disable it
2016-11-16 01:23:50 -03:00
Jonathan Leibiusky
7f9cf57f8f Merge pull request #37 from franela/google-recaptcha
Validates that user is a human.
2016-11-15 22:08:42 -03:00
Marcos Lilljedahl
a97a7c793e Restart sh if user exits session accidentally 2016-11-15 18:54:51 -03:00
Jonathan Leibiusky @xetorthio
2afff63f4c Remove typo introduced my @marcosnils! ahem :P 2016-11-15 17:03:26 -03:00
Jonathan Leibiusky @xetorthio
af9986c0f8 Validates that user is a human.
Add google recaptcha as an initial page before creating any session.
To configure recaptcha there are 2 environment variables that are needed
`GOOGLE_RECAPTCHA_SITE_KEY` and `GOOGLE_RECAPTCHA_SITE_SECRET`.
The code contains development defaults that should be set in production
to real values.
**NOTICE: Development defaults assume that the domain is `localhost`**
2016-11-15 16:53:44 -03:00
Marcos Nils
e574a95baf Change index hour count. 2016-11-15 16:46:18 -03:00
Marcos Nils
770945ab86 Merge pull request #36 from franela/robots
Add robots file
2016-11-15 20:02:02 +02:00
Jonathan Leibiusky
e27ccefc2b Merge pull request #35 from franela/expire-sessions-onload
After loading saved sessions schedule them to expire
2016-11-15 15:00:39 -03:00
Jonathan Leibiusky @xetorthio
70c4d33e6b Add robots file 2016-11-15 14:58:11 -03:00
Jonathan Leibiusky @xetorthio
802375bbf7 After loading saved sessions schedule them to expire 2016-11-15 14:49:50 -03:00
Jonathan Leibiusky
a552e19ec6 Merge pull request #34 from franela/session-expiration-clock
Add expiration clock to sessions
2016-11-15 13:37:29 -03:00
Jonathan Leibiusky @xetorthio
db074a5804 Add expiration clock to sessions 2016-11-15 13:20:59 -03:00
Marcos Lilljedahl
939c045198 Change default dind image and prevent session panic 2016-11-15 01:46:29 -03:00
Marcos Lilljedahl
cab8eef9da Add ignore pwd folder 2016-11-14 22:12:59 -03:00
Marcos Lilljedahl
e8d69d6a21 Fix session config for docker image 2016-11-14 22:08:53 -03:00
Marcos Nils
6a0e07aeec Merge pull request #32 from franela/session_persist
Session persist
2016-11-15 02:33:31 +02:00
Marcos Lilljedahl
23bb4eaf69 Add session persistence and use attach instead of exec 2016-11-14 21:29:32 -03:00
Marcos Lilljedahl
dec3861c2c Merge branch 'master' of github.com:franela/play-with-docker 2016-11-14 18:23:40 -03:00
Marcos Lilljedahl
6148dd8d86 Ctrl-m is enter :S 2016-11-14 18:23:24 -03:00
Marcos Nils
9904813fff Fixed grammar in session closing dialog (#31)
WOHO!!!! 👍
2016-11-14 23:03:50 +02:00
Michael Irwin
aa0e6ba30e
Fixed grammar in session closing dialog 2016-11-14 16:02:09 -05:00
Marcos Lilljedahl
227af2338d Change default dind detach keys to standard PQ can be used in PWD 2016-11-14 17:49:34 -03:00
Marcos Lilljedahl
46f95ce6a5 Increase limits and change ngrok instance 2016-11-14 16:38:57 -03:00
Marcos Nils
8958b240bf fix typo 2016-11-14 13:59:08 -03:00
Marcos Nils
5dc6687239 Add ngrok instructions. 2016-11-14 13:58:40 -03:00
Marcos Nils
3631f2fa2e Add ngrok instructions. 2016-11-14 13:58:32 -03:00
Marcos Lilljedahl
9cc0b68305 Add Dockerfile for pwd dind image 2016-11-14 12:26:56 -03:00
Marcos Lilljedahl
3e142c91e8 Revert transport preference 2016-11-14 11:56:26 -03:00
Marcos Lilljedahl
f63abdf3dd Focus terminal when changing instances 2016-11-14 02:05:50 -03:00
Marcos Lilljedahl
46a186f28b Add hostname to instance name 2016-11-14 01:29:36 -03:00
Marcos Lilljedahl
bea093e67a Use 1.12.3 dind image 2016-11-14 00:55:02 -03:00
Marcos Lilljedahl
2450d53eeb Avoid app crash if WS handler panics 2016-11-13 21:56:19 -03:00
Marcos Lilljedahl
27dd5d6f7b Add Swarm and IPVS instructions 2016-11-13 16:45:03 -03:00
Marcos Lilljedahl
a0e43f1328 Use latest golang 1.7 version 2016-11-13 13:50:27 -03:00
Marcos Nils
6d445c6205 Fix after initializing the terminal (#25) 2016-11-13 17:10:04 +02:00
Marcos Nils
cdf1027e94 Memory limit (#26)
* Hardcode memory to 512mb

Fixes #21

* Add constants to define memory and disable OOM
2016-11-13 17:09:44 +02:00
Jonathan Leibiusky
f49f0d8ce0 Merge pull request #22 from franela/transport_preference
Change connection preferrence so it tries with WS first and the polling
2016-11-13 06:36:14 +02:00