using git bundles rather than zips

jatinkatyal13 · jatinkatyal13 · commit c13ff8de51a2 · 2020-06-15T17:29:55.000+05:30
diff --git a/containers/project-worker/base/Dockerfile b/containers/project-worker/base/Dockerfile
@@ -1,8 +1,8 @@
 FROM alpine:3.11.5
 
-RUN apk add --no-cache gcc musl-dev bash
+RUN apk add --no-cache gcc musl-dev bash python3 git openssh
 
 COPY ./runguard /usr/src/runguard
 RUN gcc /usr/src/runguard/runguard.c -o /bin/runguard
 
-COPY ./judge.sh ./bin/judge.sh
+COPY ./judge.py ./bin/judge.py
diff --git a/containers/project-worker/base/judge.py b/containers/project-worker/base/judge.py
@@ -0,0 +1,58 @@
+#! /usr/bin/python3
+
+import sys
+import os
+import subprocess
+import argparse
+
+def compareHash(path):
+  hash1 = subprocess.getoutput(f'git --git-dir=problem/.git log --pretty=format:\'%h\' -n 1 -- {path}')
+  hash2 = subprocess.getoutput(f'git --git-dir=solution/.git log --pretty=format:\'%h\' -n 1 -- {path}')
+
+  return hash1 == hash2
+
+def buildAndRun(timeout):
+  currentDir = os.getcwd()
+  os.chdir('solution')
+
+  subprocess.call('/bin/setup.sh')
+  subprocess.call(f'/bin/build.sh 1> {currentDir}/build.stdout 2> {currentDir}/build.stderr', shell=True)
+  subprocess.call([
+    f'runguard \
+    -t {timeout} \
+    -E {currentDir}/result.code \
+    -T {currentDir}/result.time \
+    /bin/run.sh 1> {currentDir}/run.stdout 2> {currentDir}/run.stderr'
+  ], shell=True)
+
+def main(timeout, locked):
+
+  # Compare hashes locked directories
+  for path in locked:
+    if not compareHash(path):
+      open('result.code', 'w').write('25')
+      open('result.stderr', 'w').write('Solution modified test directory')
+      sys.exit(1)
+
+  buildAndRun(timeout)
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+
+  parser.add_argument(
+    '-t', 
+    '--timeout', 
+    help='Timeout for the Code Run', 
+    default=20
+  )
+  parser.add_argument(
+    '-l', 
+    '--locked-paths', 
+    nargs='+', 
+    help='List of paths whose hash is to be compared', 
+    required=True
+  )
+
+  args = parser.parse_args()
+  timeout, locked = args.timeout, args.locked_paths
+  main(timeout, locked)
diff --git a/containers/project-worker/base/judge.sh b/containers/project-worker/base/judge.sh
diff --git a/push_docker_images.sh b/push_docker_images.sh
@@ -6,6 +6,6 @@ for type in $(ls "$DIR/containers")
 do
     for lang in $(ls "$DIR/containers/$type")
     do
-        docker push codingblocks/$type-$lang $DIR/containers/$type/$lang
+        docker push codingblocks/$type-$lang
     done
 done
diff --git a/tests/project-worker/nodejs/problem/.gitignore b/tests/project-worker/nodejs/problem/.gitignore
@@ -77,3 +77,6 @@ typings/
 
 #DynamoDB Local files 
 .dynamodb/ 
+
+# MAC OS
+.DS_Store
diff --git a/tests/project-worker/nodejs/solution/.gitignore b/tests/project-worker/nodejs/solution/.gitignore
@@ -77,3 +77,6 @@ typings/
 
 #DynamoDB Local files 
 .dynamodb/ 
+
+# MAC OS
+.DS_Store
diff --git a/tests/project-worker/nodejs/solution/src/index.js b/tests/project-worker/nodejs/solution/src/index.js
@@ -3,13 +3,8 @@ const express = require('express')
 const app = express()
 
 app.get('/users', (req, res) => {
-  const users = [
-    {
-      id: 1,
-      name: 'Jatin Katyal'
-    }
-  ]
-  res.json(users)
+  // TODO: 
+  res.json([{ name: 'jatin' }])
 })
 
 app.listen(3000, () => console.log('App running'))
diff --git a/tests/project-worker/test_workers.sh b/tests/project-worker/test_workers.sh
@@ -18,7 +18,7 @@ docker run \
     --rm \
     -v "$RUNBOX":/usr/src/runbox \
     -w /usr/src/runbox codingblocks/project-worker-"$LANGUAGE" \
-    /bin/judge.sh -s src/*
+    /bin/judge.py -l package.json yarn.lock test
 
 ls -lh ${RUNBOX}
 
