Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit 218ff54

Browse files
committed
NoVNC new defaults: autoconnect=true, view_only=true, resize=scale
1 parent 599e31f commit 218ff54

File tree

3 files changed

+36
-10
lines changed

3 files changed

+36
-10
lines changed

CHANGELOG.md

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,36 @@ Note image ids also change after scm-source.json has being updated which trigger
77
###### To get container versions
88
docker exec grid versions
99

10-
## 3.0.1f
11-
+ Date: 2016-11-18
10+
## TBD_DOCKER_TAG
11+
+ Date: TBD_DATE
1212
+ NoVNC new defaults: autoconnect=true, view_only=true, resize=scale
1313
+ NoVNC add index.html to shorten the url
14+
+ Image tag details:
15+
+ Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
16+
+ Selenium 3: 3.0.1 (1969d75)
17+
+ Chrome stable: TBD_CHROME_STABLE
18+
+ Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
19+
+ Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
20+
+ Geckodriver: TBD_GECKO_DRIVER
21+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
22+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
23+
+ Timezone: TBD_TIME_ZONE
24+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
25+
+ Python: TBD_PYTHON_VERSION
26+
+ Sauce Connect TBD_SAUCE_CONNECT_VERS, build TBD_SAUCE_CONNECT_BUILD TBD_SAUCE_CONNECT_REVISION
27+
+ BrowserStack Local version TBD_BROWSER_STACK_VERSION
28+
+ Tested on kernel dev host: 4.4.0-47-generic x86_64
29+
+ Tested on kernel CI host: TBD_HOST_UNAME
30+
+ Built at dev host with: Docker version 1.12.3, build 6b644ec
31+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
32+
+ Built at dev host with: Docker Compose version 1.9.0, build 2585387
33+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
34+
+ Image size: TBD_IMAGE_SIZE
35+
+ Digest: TBD_DIGEST
36+
+ Image ID: TBD_IMAGE_ID
37+
38+
## 3.0.1f
39+
+ Date: 2016-11-18
1440
+ Upgrade Firefox major from 49.0.2 to 50.0 (only for selenium 3)
1541
+ Upgrade Ubuntu xenial date from 20161010 to 20161114
1642
+ Image tag details:

CONTRIBUTING.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ For pull requests or local commits:
77
docker exec grid versions && ./test/after_script && travis lint
88
open ./images/grid2_console.png && open ./images/grid3_console.png && open ./videos/mobile_emulation/*.mkv
99
open test/seleIDE/videos/rc/sele_ide.mkv
10-
git checkout -b tmp-3.0.1f && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
10+
git checkout -b tmp-3.0.1g && git checkout ./images/grid2_console.png && git checkout ./images/grid3_console.png
1111
#git add ... git commit ... git push ... open pull request
1212

1313
For repository owners only:
1414

15-
git commit -m "Upgrade Firefox major from 49.0.2 to 50.0"
16-
git tag -d latest && git tag 3.0.1f && git push origin tmp-3.0.1f && git push --tags
15+
git commit -m "NoVNC new defaults: autoconnect=true, view_only=true, resize=scale"
16+
git tag -d latest && git tag 3.0.1g && git push origin tmp-3.0.1g && git push --tags
1717

1818
-- Wait for Travis to pass OK
1919
-- Make sure changes got merged into master by elgalubot
2020

21-
git checkout master && git pull && git branch -d tmp-3.0.1f && git push origin --delete tmp-3.0.1f
21+
git checkout master && git pull && git branch -d tmp-3.0.1g && git push origin --delete tmp-3.0.1g
2222

2323
-- Re-add TBD_* section in CHANGELOG.md starting with TBD_DOCKER_TAG
2424
-- If Chrome version changed upload:
@@ -35,9 +35,9 @@ Keep certain bins if chrome version changed for example:
3535
## Retry
3636
Failed in Travis? retry
3737

38-
git tag -d 3.0.1f && git push origin :3.0.1f
38+
git tag -d 3.0.1g && git push origin :3.0.1g
3939
#git add ...
40-
git commit --amend && git tag 3.0.1f && git push --force origin tmp-3.0.1f && git push --tags
40+
git commit --amend && git tag 3.0.1g && git push --force origin tmp-3.0.1g && git push --tags
4141

4242
## Docker push from Travis CI
4343
Travis [steps](https://docs.travis-ci.com/user/docker/#Pushing-a-Docker-Image-to-a-Registry) involve `docker login` and docker credentials encryptions.

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,13 +402,13 @@ USER seluser
402402
########################################
403403
# noVNC to expose VNC via an html page #
404404
########################################
405-
# Download elgalu/noVNC dated 2016-11-13 commit fae4cec14caefa0bf3462fb0a186476a93192d05
405+
# Download elgalu/noVNC dated 2016-11-18 commit 9223e8f2d1c207fb74cb4b8cc243e59d84f9e2f6
406406
# Download kanaka/noVNC dated 2016-11-10 commit 80b7dde665cac937aa0929d2b75aa482fc0e10ad
407407
# Download kanaka/noVNC dated 2016-02-24 commit b403cb92fb8de82d04f305b4f14fa978003890d7
408408
# Download kanaka/websockify dated 2016-10-10 commit cb1508fa495bea4b333173705772c1997559ae4b
409409
# Download kanaka/websockify dated 2015-06-02 commit 558a6439f14b0d85a31145541745e25c255d576b
410410
# Layer size: small: 2.919 MB
411-
ENV NOVNC_SHA="fae4cec14caefa0bf3462fb0a186476a93192d05" \
411+
ENV NOVNC_SHA="9223e8f2d1c207fb74cb4b8cc243e59d84f9e2f6" \
412412
WEBSOCKIFY_SHA="cb1508fa495bea4b333173705772c1997559ae4b"
413413
RUN wget -nv -O noVNC.zip \
414414
"https://github.com/elgalu/noVNC/archive/${NOVNC_SHA}.zip" \

0 commit comments

Comments
 (0)