Skip to content

Commit

Permalink
Java installation
Browse files Browse the repository at this point in the history
  • Loading branch information
@willnode
willnode committed Nov 26, 2023
1 parent a85eb7c commit bfac868
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 9 deletions.
34 changes: 30 additions & 4 deletions src/executor/runner.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
detectCanShareSSL,
escapeShell,
getDbName,
getJavaVersion,
getLtsPhp,
getPythonVersion,
getRevision,
Expand Down Expand Up @@ -560,19 +561,44 @@ export default async function runConfig(config, domain, writer, sandbox = false)
await sshExec("pathman remove ~/.dotnet");
} else {
if (value == "latest" || value == "current") {
arg = "-- --version latest"
arg = "--version latest"
} else if ( !value || value == "lts" || value == "stable") {
arg = ""
arg = "--channel LTS"
} else if ( value == "sts") {
arg = "--channel STS"
} else {
arg = ''
arg = '--channel ' + value;
}
await writeLog("$> changing Dotnet engine to " + (value || 'lts'));
await sshExec("command -v pathman &> /dev/null || (curl -sS https://webinstall.dev/pathman | bash) ; source ~/.bashrc");
await sshExec(`curl -sS https://dot.net/v1/dotnet-install.sh | bash -s ${arg}`);
await sshExec(`wget https://dot.net/v1/dotnet-install.sh -O ~/tmp/dotnet-install.sh && bash ~/tmp/dotnet-install.sh ${arg}`);
await sshExec(`pathman add ~/.dotnet ; source ~/.config/envman/PATH.env`);
await sshExec("dotnet --version");
}
break;
case 'jdk':
case 'java':
arg = value;
if (value == 'off') {
await writeLog("$> removing Java engine");
await sshExec("rm -rf ~/.local/java");
await sshExec("pathman remove ~/.local/java/jdk/bin");
} else {
const jarg = getJavaVersion(value);
if (!jarg.binary) {
throw new Error(`No Java with version ${value} is available to install`);
}
await writeLog("$> changing Java engine to " + jarg.version);
await sshExec("command -v pathman &> /dev/null || (curl -sS https://webinstall.dev/pathman | bash); source ~/.bashrc");
await sshExec(`cd ~/tmp && mkdir -p ~/.local/java/jdk-${jarg.version}`);
await sshExec(`wget "${jarg.binary}" -O ~/tmp/jdk.tar.gz && tar -axf jdk.tar.gz && rm $_`);
await sshExec(`mv ~/tmp/jdk-*/* ~/.local/java/jdk-${jarg.version} || true ; rm -rf ~/tmp/jdk-*`);
await sshExec(`ln -sfn ~/.local/java/jdk-${jarg.version} ~/.local/java/jdk`);
await sshExec(`pathman add ~/.local/java/jdk/bin ; source ~/.config/envman/PATH.env`);
await sshExec("cd ~/public_html", false);
await sshExec("java --version");
}
break;
default:
break;
}
Expand Down
76 changes: 71 additions & 5 deletions src/util.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ let tokenSecret, allowIps, sudoutil, version, revision;
let phpVersionsList = ['7.4'];
let rubyVersionsList = [];
let pythonVersionsList = [];
let javaVersionsList = [];
/**
* @type {Record<string, string>}
*/
let pythonVersionsMap = {};
/**
* @type {Record<string, string>}
*/
let javaVersionsMap = {};
/**
* @type {Record<string, string>}
*/
Expand All @@ -27,14 +32,17 @@ const pythonConstants = {
index() {
return `https://github.com/indygreg/python-build-standalone/releases/expanded_assets/${this.tag}`
},
latestTagUrl() {
return 'https://raw.githubusercontent.com/indygreg/python-build-standalone/latest-release/latest-release.json';
},
/**
* @param {string} filename
*/
asset_url(filename) {
return `https://github.com/indygreg/python-build-standalone/releases/download/${this.tag}/${filename}`;
},
}
export const initUtils = () => {
export const initUtils = async () => {
tokenSecret = `Bearer ${process.env.SECRET}`;
allowIps = process.env.ALLOW_IP ? process.env.ALLOW_IP.split(',').reduce((a, b) => {
a[b] = true;
Expand All @@ -52,7 +60,7 @@ export const initUtils = () => {
}
return a;
}, {}) : {};
axios.get('https://www.php.net/releases/?json').then(res => {
await axios.get('https://www.php.net/releases/?json').then(res => {
Object.values(res.data).forEach(v => {
v.supported_versions.forEach((/** @type {string} */ ver) => {
if (!phpVersionsList.includes(ver)) {
Expand All @@ -65,7 +73,7 @@ export const initUtils = () => {
console.error('error fetching PHP releases', err);
});
// TODO: detect OS/arch?
axios.get('https://rvm.io/binaries/centos/9/x86_64/').then(res => {
await axios.get('https://rvm.io/binaries/centos/9/x86_64/').then(res => {
// @ts-ignore
var matches = [...("" + res.data).matchAll(/href="ruby-([.\d]+).tar.bz2"/g)]
for (const match of matches) {
Expand All @@ -77,7 +85,15 @@ export const initUtils = () => {
}).catch(err => {
console.error('error fetching Ruby releases', err);
});
axios.get(pythonConstants.index()).then(res => {

await axios.get(pythonConstants.latestTagUrl()).then(res => {
if (res.data && res.data.tag) {
pythonConstants.tag = res.data.tag;
} else {
console.warn('unable get latest python tag');
}
})
await axios.get(pythonConstants.index()).then(res => {
// @ts-ignore
var matches = [...("" + res.data).matchAll(pythonConstants.match)]
for (const match of matches) {
Expand All @@ -90,6 +106,18 @@ export const initUtils = () => {
}).catch(err => {
console.error('error fetching Python releases', err);
});
await axios.get('https://raw.githubusercontent.com/actions/setup-java/main/src/distributions/microsoft/microsoft-openjdk-versions.json').then(res => {
for (const verItem of res.data) {
if (verItem.version && verItem.files) {
var iPlatform = verItem.files.findIndex(x => x.filename.endsWith('-linux-x64.tar.gz'))
if (iPlatform >= 0) {
javaVersionsList.push(verItem.version);
javaVersionsMap[verItem.version] = verItem.files[iPlatform].download_url;
}
}
}
javaVersionsList = sortSemver(javaVersionsList).reverse();
})
}

export const getLtsPhp = (/** @type {string} */ major) => {
Expand Down Expand Up @@ -121,7 +149,7 @@ export const getPythonVersion = (/** @type {string} */ status) => {
if (m) {
return expand(m);
} else {
return expand(m + ":latest");
return expand(status + ":latest");
}
}
if (/^\d+\.\d+\.\d+$/.test(status)) {
Expand Down Expand Up @@ -175,6 +203,43 @@ export const getRubyVersion = (/** @type {string} */ status) => {
}
}

export const getJavaVersion = (/** @type {string} */ status) => {
const expand = (/** @type {string} */ version) => ({
version,
binary: javaVersionsMap[version] || null,
})
// get latest stable version
var stable = javaVersionsList[0];
if (!status) {
return expand(stable);
}
if (/^\d+(\.\d+)?$/.test(status)) {
var m = javaVersionsList.find(x => {
return x.startsWith(status);
});
if (m) {
return expand(m);
} else {
return expand(status + ":latest");
}
}
if (/^\d+\.\d+\.\d+$/.test(status)) {
return expand(status);
}
switch (status) {
case 'lts':
case 'security':
var security = javaVersionsList.find(x => {
return !x.startsWith(stable.substring(0, stable.lastIndexOf('.')));
});
return expand(security || stable);
case 'latest':
case 'stable':
default:
return expand(stable);
}
}

export const getVersion = () => {
return version;
}
Expand Down Expand Up @@ -205,6 +270,7 @@ export const getSupportVersions = () => {
php: phpVersionsList,
python: pythonVersionsList,
ruby: rubyVersionsList,
java: javaVersionsList,
}
}

Expand Down

0 comments on commit bfac868

Please sign in to comment.