From 4621f34e4701ebf203255aed416e8c16b69471e7 Mon Sep 17 00:00:00 2001 From: Thomas Hobson Date: Sat, 13 Mar 2021 23:09:13 +1300 Subject: [PATCH] api: fixes from refactor --- api/Dockerfile | 7 +++---- api/src/ppman/package.js | 2 +- api/src/ppman/routes.js | 2 +- api/src/runtime.js | 14 +++++++------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 8f49ca1..fd261bd 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,13 +1,12 @@ FROM node:15.8.0-buster-slim RUN dpkg-reconfigure -p critical dash -RUN apt-get update && \ - apt-get install -y libxml2 gnupg tar coreutils util-linux && \ - rm -rf /var/lib/apt/lists/* - RUN for i in $(seq 1001 1500); do \ groupadd -g $i runner$i && \ useradd -M runner$i -g $i -u $i ; \ done +RUN apt-get update && \ + apt-get install -y libxml2 gnupg tar coreutils util-linux libc6-dev binutils && \ + rm -rf /var/lib/apt/lists/* ENV NODE_ENV=production WORKDIR /piston_api diff --git a/api/src/ppman/package.js b/api/src/ppman/package.js index 2b31137..0f4c78d 100644 --- a/api/src/ppman/package.js +++ b/api/src/ppman/package.js @@ -103,7 +103,7 @@ class Package { ); proc.once('exit', (code, _) => { - code === 0 ? resolve() : reject(); + code === 0 ? resolve(stdout) : reject(); }); proc.stdout.on('data', data => { diff --git a/api/src/ppman/routes.js b/api/src/ppman/routes.js index e371b7a..fc8bbaf 100644 --- a/api/src/ppman/routes.js +++ b/api/src/ppman/routes.js @@ -42,7 +42,7 @@ module.exports = { async package_list(req, res) { logger.debug('Request to list packages'); - const packages = await get_package_list(); + let packages = await get_package_list(); packages = packages .map(pkg => { diff --git a/api/src/runtime.js b/api/src/runtime.js index e220aec..2603835 100644 --- a/api/src/runtime.js +++ b/api/src/runtime.js @@ -35,30 +35,30 @@ class Runtime { } get compiled() { - if (this.compiled === undefined) { - this.compiled = fss.exists_sync(path.join(this.pkgdir, 'compile')); + if (this._compiled === undefined) { + this._compiled = fss.exists_sync(path.join(this.pkgdir, 'compile')); } - return this.compiled; + return this._compiled; } get env_vars() { - if (!this.env_vars) { + if (!this._env_vars) { const env_file = path.join(this.pkgdir, '.env'); const env_content = fss.read_file_sync(env_file).toString(); - this.env_vars = {}; + this._env_vars = {}; env_content .trim() .split('\n') .map(line => line.split('=',2)) .forEach(([key,val]) => { - this.env_vars[key.trim()] = val.trim(); + this._env_vars[key.trim()] = val.trim(); }); } - return this.env_vars; + return this._env_vars; } toString() {