Skip to content

Commit

Permalink
Fix docker, update binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
@willnode
willnode committed Nov 1, 2024
1 parent 8f3b1fe commit 67552af
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 34 deletions.
62 changes: 31 additions & 31 deletions src/binaries/metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"x64": {
"rubyVersionsList": [
"3.3.5",
"3.2.5",
"3.2.6",
"3.1.6",
"3.0.7",
"2.7.8",
Expand All @@ -21,35 +21,35 @@
"3.9.20"
],
"javaVersionsList": [
"23.0.0+37",
"23.0.1+11",
"22.0.2+9",
"21.0.4+7.0.LTS",
"21.0.5+11.0.LTS",
"20.0.2+9",
"19.0.2+7",
"18.0.2+101",
"17.0.12+7",
"17.0.13+11",
"16.0.2+7",
"11.0.24+8",
"8.0.422+5"
"11.0.25+9",
"8.0.432+6"
],
"pythonVersionsMap": {
"3.10.15": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.10.15+20241008-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst",
"3.11.10": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.11.10+20241008-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst",
"3.12.7": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.12.7+20241008-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst",
"3.13.0": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.13.0+20241008-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst",
"3.9.20": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.9.20+20241008-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst"
"3.10.15": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.10.15+20241016-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst",
"3.11.10": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.11.10+20241016-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst",
"3.12.7": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.12.7+20241016-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst",
"3.13.0": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.13.0+20241016-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst",
"3.9.20": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.9.20+20241016-x86_64_v3-unknown-linux-gnu-pgo+lto-full.tar.zst"
},
"javaVersionsMap": {
"8.0.422+5": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_linux_hotspot_8u422b05.tar.gz",
"11.0.24+8": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.24_8.tar.gz",
"8.0.432+6": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u432b06.tar.gz",
"11.0.25+9": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.25_9.tar.gz",
"16.0.2+7": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz",
"17.0.12+7": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz",
"17.0.13+11": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz",
"18.0.2+101": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_x64_linux_hotspot_18.0.2.1_1.tar.gz",
"19.0.2+7": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_x64_linux_hotspot_19.0.2_7.tar.gz",
"20.0.2+9": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.gz",
"21.0.4+7.0.LTS": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz",
"21.0.5+11.0.LTS": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz",
"22.0.2+9": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_linux_hotspot_22.0.2_9.tar.gz",
"23.0.0+37": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_x64_linux_hotspot_23_37.tar.gz"
"23.0.1+11": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz"
},
"rubyVersionsMap": {
"2.1.9": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-2.1.9-ubuntu-24.04.tar.gz",
Expand All @@ -61,14 +61,14 @@
"2.7.8": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-2.7.8-ubuntu-24.04.tar.gz",
"3.0.7": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.0.7-ubuntu-24.04.tar.gz",
"3.1.6": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.1.6-ubuntu-24.04.tar.gz",
"3.2.5": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.2.5-ubuntu-24.04.tar.gz",
"3.2.6": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.2.6-ubuntu-24.04.tar.gz",
"3.3.5": "https://github.com/ruby/ruby-builder/releases/download/toolcache/ruby-3.3.5-ubuntu-24.04.tar.gz"
}
},
"arm64": {
"rubyVersionsList": [
"3.3.5",
"3.2.5",
"3.2.6",
"3.1.6",
"3.0.7",
"2.7.8",
Expand All @@ -87,35 +87,35 @@
"3.9.20"
],
"javaVersionsList": [
"23.0.0+37",
"23.0.1+11",
"22.0.2+9",
"21.0.5+11.0.LTS",
"20.0.2+9",
"19.0.2+7",
"18.0.2+101",
"17.0.12+7",
"17.0.13+11",
"16.0.2+7",
"11.0.24+8",
"8.0.422+5"
"11.0.25+9",
"8.0.432+6"
],
"pythonVersionsMap": {
"3.10.15": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.10.15+20241008-aarch64-unknown-linux-gnu-lto-full.tar.zst",
"3.11.10": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.11.10+20241008-aarch64-unknown-linux-gnu-lto-full.tar.zst",
"3.12.7": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.12.7+20241008-aarch64-unknown-linux-gnu-lto-full.tar.zst",
"3.13.0": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.13.0+20241008-aarch64-unknown-linux-gnu-lto-full.tar.zst",
"3.9.20": "https://github.com/indygreg/python-build-standalone/releases/download/20241008/cpython-3.9.20+20241008-aarch64-unknown-linux-gnu-lto-full.tar.zst"
"3.10.15": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.10.15+20241016-aarch64-unknown-linux-gnu-lto-full.tar.zst",
"3.11.10": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.11.10+20241016-aarch64-unknown-linux-gnu-lto-full.tar.zst",
"3.12.7": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.12.7+20241016-aarch64-unknown-linux-gnu-lto-full.tar.zst",
"3.13.0": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.13.0+20241016-aarch64-unknown-linux-gnu-lto-full.tar.zst",
"3.9.20": "https://github.com/indygreg/python-build-standalone/releases/download/20241016/cpython-3.9.20+20241016-aarch64-unknown-linux-gnu-lto-full.tar.zst"
},
"javaVersionsMap": {
"8.0.422+5": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_aarch64_linux_hotspot_8u422b05.tar.gz",
"11.0.24+8": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.24_8.tar.gz",
"8.0.432+6": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u432-b06/OpenJDK8U-jdk_aarch64_linux_hotspot_8u432b06.tar.gz",
"11.0.25+9": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.25%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.25_9.tar.gz",
"16.0.2+7": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz",
"17.0.12+7": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.12_7.tar.gz",
"17.0.13+11": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.13_11.tar.gz",
"18.0.2+101": "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.2.1%2B1/OpenJDK18U-jdk_aarch64_linux_hotspot_18.0.2.1_1.tar.gz",
"19.0.2+7": "https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.2%2B7/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.2_7.tar.gz",
"20.0.2+9": "https://github.com/adoptium/temurin20-binaries/releases/download/jdk-20.0.2%2B9/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.gz",
"21.0.5+11.0.LTS": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz",
"22.0.2+9": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_aarch64_linux_hotspot_22.0.2_9.tar.gz",
"23.0.0+37": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23%2B37/OpenJDK23U-jdk_aarch64_linux_hotspot_23_37.tar.gz"
"23.0.1+11": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz"
},
"rubyVersionsMap": {}
}
Expand Down
4 changes: 2 additions & 2 deletions src/executor/runnercode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export async function runConfigCodeFeatures(key, value, writeLog, domaindata, ss
await sshExec(`sed -i '/DOCKER_HOST=/d' ~/.bashrc`, false);
await sshExec(`echo "export DOCKER_HOST=unix:///run/user/$(id -u)/docker.sock" >> ~/.bashrc;`);
await sshExec(`mkdir -p ~/.config/docker; echo '{"exec-opts": ["native.cgroupdriver=cgroupfs"]}' > ~/.config/docker/daemon.json`);
await sshExec(`dockerd-rootless-setuptool.sh install`);
await sshExec(`dockerd-rootless-setuptool.sh install --skip-iptables`);
await sshExec(`export DOCKER_HOST=unix:///run/user/$(id -u)/docker.sock`, false);
} else if (value === 'off') {
await writeLog("$> Disabling docker features");
Expand All @@ -47,7 +47,7 @@ export async function runConfigCodeFeatures(key, value, writeLog, domaindata, ss
await sshExec(`cd ~/tmp && mkdir -p ~/.pyenv/versions/${parg.version}`);
await sshExec(`wget -O python.tar.zst "${parg.binary}" && tar -axf python.tar.zst && rm $_`);
await sshExec(`mv ~/tmp/python/install/* ~/.pyenv/versions/${parg.version} || true ; rm -rf ~/tmp/python`);
await sshExec(`echo "export LD_LIBRARY_PATH=~/.pyenv/versions/${parg.version}:$LD_LIBRARY_PATH" >> ~/.bashrc`)
await sshExec(`echo "export LD_LIBRARY_PATH=~/.pyenv/versions/${parg.version}:$LD_LIBRARY_PATH" >> ~/.bashrc`) // fix venv
await sshExec("cd ~/public_html", false);
} else if (parg.version !== "system") {
await sshExec(`pyenv install ${parg.version} -s`);
Expand Down
3 changes: 2 additions & 1 deletion src/util.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ export const getPythonVersion = (/** @type {string} */ status) => {
}
}
if (/^\d+\.\d+\.\d+$/.test(status)) {
return expand(status);
// no binaries
return { version: status, binary: null };
}
switch (status) {
case 'lts':
Expand Down

0 comments on commit 67552af

Please sign in to comment.