Docker configuration

Author: inkustr

service/.dockerignore

@@ -4,5 +4,4 @@ data/
 Dockerfile
 docker-compose.yml
 .dockerignore
-.gitignore
-.env
+.gitignore

service/Dockerfile

@@ -18,11 +18,13 @@ ENV DOCKER_HOST=unix:///var/run/docker.sock
 
 WORKDIR /var/www/html
 
+COPY . /var/www/html
+
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 
 COPY docker/nginx.conf /etc/nginx/sites-available/default
 
-RUN mkdir -p var/log && chmod -R 777 var/log
+RUN mkdir -p var/log var/cache public/submissions && chmod -R 777 var/log var/cache public/submissions
 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 

service/docker-compose.yml

@@ -4,17 +4,14 @@ services:
   php:
     build: .
     volumes:
-      - ./:/var/www/html:rw
-      - ./var/log:/var/www/html/var/log:rw
       - /var/run/docker.sock:/var/run/docker.sock:rw
     ports:
       - "8055:80"
     depends_on:
       - database
     environment:
       DATABASE_URL: "postgresql://${POSTGRES_USER:-app}:${POSTGRES_PASSWORD:-app}@database:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-16}"
-    group_add:
-      - 944
+    restart: unless-stopped
     mem_limit: 1g
     cpus: 1
 

service/src/Command/CodeExecutor.php

@@ -10,6 +10,7 @@ class CodeExecutor
 {
     public function executeUserCode(string $code, Problem $problem, mixed $userId): array
     {
+        $maxRuntime = min($problem->getMaxRuntime(), 1);
         $results = [];
         $submissionsRoot = getcwd() . '/submissions';
         $userProblemDir = "$submissionsRoot/$userId/{$problem->getId()}";
@@ -18,7 +19,6 @@ public function executeUserCode(string $code, Problem $problem, mixed $userId):
             mkdir($userProblemDir, 0777, true);
         }
 
-        // Сохраняем решение
         file_put_contents("$userProblemDir/solution.py", $code);
 
         foreach ($problem->getTestCases() as $i => $input) {
@@ -32,11 +32,11 @@ public function executeUserCode(string $code, Problem $problem, mixed $userId):
                     'docker', 'create',
                     '--network', 'none',
                     '--cpus', '0.5',
-                    '--memory', '256m',
+                    '--memory', '64m',
                     '--name', $containerName,
                     'python:3.10-slim',
                     'bash', '-c',
-                    "timeout 2s python submissions/$userId/{$problem->getId()}/solution.py < submissions/$userId/{$problem->getId()}/input.txt"
+                    "timeout {$maxRuntime}s python submissions/$userId/{$problem->getId()}/solution.py < submissions/$userId/{$problem->getId()}/input.txt"
                 ]);
                 $create->mustRun();
 
@@ -50,7 +50,7 @@ public function executeUserCode(string $code, Problem $problem, mixed $userId):
                 $start = new Process([
                     'docker', 'start', '-a', $containerName
                 ]);
-                $start->setTimeout(4);
+                $start->setTimeout($maxRuntime + 2);
                 $start->run();
 
                 $stdout = trim($start->getOutput());
@@ -85,7 +85,7 @@ public function executeUserCode(string $code, Problem $problem, mixed $userId):
                 $results[] = [
                     'input'    => $input,
                     'expected' => $problem->getExpectedOutputs()[$i],
-                    'output'   => null,
+                    'output'   => "Time limit exceeded",
                     'passed'   => false,
                     'error'    => 'Time limit exceeded',
                 ];