Added docker support

Author: pkfln

.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+dist
+yarn-error.log
+fiddles

Dockerfile

@@ -0,0 +1,30 @@
+FROM node
+
+# SAMPCTL
+COPY sampctl-install-deb-sudo.sh /
+RUN dpkg --add-architecture i386 && \
+    apt update && \
+    apt install -y g++-multilib git ca-certificates && \
+    sh /sampctl-install-deb-sudo.sh
+
+# FIREJAIL
+RUN DEBIAN_FRONTEND=noninteractive apt install -y firejail
+
+# SA-MP PAWN FIDDLE
+WORKDIR /usr/src/app
+COPY package*.json /usr/src/app/
+RUN npm install
+
+WORKDIR /usr/src/app/ui
+COPY ./ui/package.json /usr/src/app/ui/
+RUN yarn install
+
+WORKDIR /usr/src/app
+COPY . .
+RUN npm run compile
+
+WORKDIR /usr/src/app/ui
+RUN yarn build
+
+WORKDIR /usr/src/app
+ENTRYPOINT [ "npm", "start" ]

build.ts

@@ -5,5 +5,3 @@ const outDir = config.compilerOptions.outDir;
 s.rm('-rf', outDir);
 s.mkdir(outDir);
 s.cp('.env', `${outDir}/.env`);
-s.mkdir('-p', `${outDir}/common/swagger`);
-s.cp('server/common/swagger/Api.yaml', `${outDir}/common/swagger/Api.yaml`);

sampctl-install-deb-sudo.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# a simple install script for sampctl
+
+ARCH=$(uname -m)
+PATTERN="browser_download_url.*386\.deb"
+
+if [ $ARCH = "x86_64" ]; then
+	PATTERN="browser_download_url.*amd64\.deb"
+fi
+
+curl -s https://api.github.com/repos/Southclaws/sampctl/releases/latest |
+	grep $PATTERN |
+	cut -d : -f 2,3 |
+	tr -d \" |
+	wget -qi - -O tmp.deb
+dpkg -i tmp.deb
+rm tmp.deb

server/common/fiddle/index.ts

@@ -161,7 +161,7 @@ export default class Fiddle {
       };
     } catch (ex) {
       const stdout: string = ex.stdout.replace('\\n', os.EOL);
-      const regex: RegExp = /\/.*\/script\.pwn\:(\d)\s\((\w+)\)\s(.*)/g;
+      const regex: RegExp = /\/.*\/script\.pwn\:(\d+)\s\((\w+)\)\s(.*)/g;
       const matches: RegExpMatchArray = stdout.match(regex);
 
       let errors: string[] = [];
@@ -185,7 +185,16 @@ export default class Fiddle {
       if (this.process)
         return false;
 
-      this.process = execa('docker', ['run', '--rm', '-v', `${path.resolve(this.getFiddleRootPath())}:/samp`, 'southclaws/sampctl', 'package', 'run']);
+      // TODO: Readd docker (docker-in-docker) support to run fiddles in a container
+      this.process = execa('firejail', [
+        '--net=none',
+        '--overlay-tmpfs',
+        'sampctl',
+        'package',
+        'run'
+      ], {
+        cwd: path.resolve(this.getFiddleRootPath())
+      });
       setTimeout(this.terminate.bind(this, this.process), 2 * 60 * 1000); // 2 Minutes
 
       return true;