suzanne.soy/KaTeX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Screenshotter: Obey --katex/selenium-ip options under --container. (#566)

Browse Source 
Some Docker configs, such as Docker for Mac, need explicit --katex-ip
and --selenium-ip options. Obey those options.
This commit is contained in:
Eddie Kohler 2016-11-22 05:23:32 -05:00 committed by Martin von Gagern
parent 22957d40f6
commit 7b5580b1fa
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dockers/Screenshotter/screenshotter.js
View File

@ -50,7 +50,6 @@ var opts = require("nomnom")
})
.option("katexIP", {
full: "katex-ip",
"default": "localhost",
help: "Full URL of the KaTeX development server",
})
.option("katexPort", {
@ -116,29 +115,33 @@ function cmd() {
function guessDockerIPs() {
if (process.env.DOCKER_MACHINE_NAME) {
var machine = process.env.DOCKER_MACHINE_NAME;
seleniumIP = cmd("docker-machine", "ip", machine);
katexIP = cmd("docker-machine", "ssh", machine,
seleniumIP = seleniumIP || cmd("docker-machine", "ip", machine);
katexIP = katexIP || cmd("docker-machine", "ssh", machine,
"echo ${SSH_CONNECTION%% *}");
return;
}
try {
// When using boot2docker, seleniumIP and katexIP are distinct.
seleniumIP = cmd("boot2docker", "ip");
seleniumIP = seleniumIP || cmd("boot2docker", "ip");
var config = cmd("boot2docker", "config");
config = (/^HostIP = "(.*)"$/m).exec(config);
if (!config) {
console.error("Failed to find HostIP");
process.exit(2);
}
katexIP = config[1];
katexIP = katexIP || config[1];
} catch (e) {
seleniumIP = katexIP = cmd("docker", "inspect",
var ip = cmd("docker", "inspect",
"-f", "{{.NetworkSettings.Gateway}}", opts.container);
seleniumIP = seleniumIP || ip;
katexIP = katexIP || ip;
}
}
if (!seleniumURL && opts.container) {
guessDockerIPs();
if (!seleniumIP || !katexIP) {
guessDockerIPs();
}
seleniumPort = cmd("docker", "port", opts.container, seleniumPort);
seleniumPort = seleniumPort.replace(/^.*:/, "");
}
@ -189,6 +192,9 @@ function startServer() {
// Wait for container to become ready
function tryConnect() {
if (!katexIP) {
katexIP = "localhost";
}
if (!katexURL) {
katexURL = "http://" + katexIP + ":" + katexPort + "/";
console.log("KaTeX URL is " + katexURL);