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

Commit e27c8fb

Browse files
committed
Support Japanese/Chinese fonts #153 credits @katryo
1 parent f269ce6 commit e27c8fb

File tree

6 files changed

+30
-6
lines changed

6 files changed

+30
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ matrix:
2828
- docker
2929
env:
3030
- DOCKER_VERSION="stable"
31-
DOCKER_COMPOSE_VERSION="1.11.2"
31+
DOCKER_COMPOSE_VERSION="1.13.0"
3232
DOCKER_PUSH=true
3333
DOCKER_PUSH_LATEST=true
3434

CHANGELOG.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,31 @@ 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+
## TBD_DOCKER_TAG
11+
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...master (TBD_DATE)
12+
+ Support Japanese/Chinese fonts #153 credits @katryo
13+
+ **Image tag details:**
14+
+ Selenium version: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
15+
+ Chrome stable: TBD_CHROME_STABLE
16+
+ Firefox stable: TBD_FIREFOX_FOR_SEL3
17+
+ Geckodriver: TBD_GECKO_DRIVER
18+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
19+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
20+
+ Timezone: TBD_TIME_ZONE
21+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
22+
+ Python: TBD_PYTHON_VERSION
23+
+ Tested on kernel dev host: 4.4.0-77-generic x86_64
24+
+ Tested on kernel CI host: TBD_HOST_UNAME
25+
+ Built at dev host with: Docker version 17.05.0-ce, build 89658be
26+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
27+
+ Built at dev host with: Docker Compose version 1.13.0, build 1719ceb
28+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
29+
+ Image size: TBD_IMAGE_SIZE
30+
+ Digest: TBD_DIGEST
31+
+ Image ID: TBD_IMAGE_ID
32+
1033
## 3.3.1-p7
11-
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/113d70a33933ea54168f85c2f5...TBD_CUR_COMM (2017-05-04)
34+
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/113d70a33933ea54168f85c2f5...7c71c322659366daf3 (2017-05-04)
1235
+ Upgrade Chrome patch to 58.0.3029.96
1336
+ Add warning that Selenium 2 support will be deprecated
1437
+ **Image tag details:**

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ For pull requests or local commits:
1212

1313
For repository owners only:
1414

15-
git commit -m "Upgrade Chrome patch to 58.0.3029.96"
15+
git commit -m "Support Japanese/Chinese fonts #153 credits @katryo"
1616
git tag -d latest; git tag -d `cat VERSION`; git push origin :`cat VERSION`; git tag `cat VERSION` && git push --force origin tmp-`cat VERSION` && git push --tags
1717

1818
-- Wait for Travis to pass OK

TBD_DOCKER_TAG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## TBD_DOCKER_TAG
2-
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...TBD_CUR_COMM (TBD_DATE)
2+
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...master (TBD_DATE)
33
+ TBD_COMMIT_MSG
44
+ **Image tag details:**
55
+ Selenium version: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
@@ -13,7 +13,7 @@
1313
+ Python: TBD_PYTHON_VERSION
1414
+ Tested on kernel dev host: 4.4.0-77-generic x86_64
1515
+ Tested on kernel CI host: TBD_HOST_UNAME
16-
+ Built at dev host with: Docker version 17.04.0-ce, build 4845c56
16+
+ Built at dev host with: Docker version 17.05.0-ce, build 89658be
1717
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
1818
+ Built at dev host with: Docker Compose version 1.13.0, build 1719ceb
1919
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.1-p7
1+
3.3.1-p8

test/before_install_build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ docker-compose --version
1010
./host-scripts/gen-scm-source.sh
1111

1212
docker build -t selenium .
13+
docker images selenium

0 commit comments

Comments
 (0)