container support

Author: blackav

bin/ejudge-setup.c

@@ -3213,7 +3213,6 @@ generate_contest_xml(FILE *f)
   } else {
     fprintf(f, "<?xml version=\"1.0\" ?>\n");
   }
-  fprintf(f, "<!-- %cId%c -->\n", '$', '$');
   fprintf(f, "<!-- Generated by ejudge-setup, version %s -->\n",
           compile_version);
   fprintf(f, "<!-- Generation date: %s -->\n", date_buf);
@@ -3276,7 +3275,7 @@ generate_userlist_xml(FILE *f)
 }
 
 static void
-generate_ejudge_xml(FILE *f)
+generate_ejudge_xml(FILE *f, int container_mode)
 {
   const struct path_edit_item *cur;
   unsigned char date_buf[64];
@@ -3293,11 +3292,14 @@ generate_ejudge_xml(FILE *f)
           compile_version);
   fprintf(f, "<!-- Generation date: %s -->\n", date_buf);
 
+  fprintf(f, "<config");
 #if CONF_HAS_LIBINTL - 0 == 1
-  fprintf(f, "<config l10n=\"yes\">\n");
-#else
-  fprintf(f, "<config>\n");
+  fprintf(f, " l10n=\"yes\"");
 #endif /* CONF_HAS_LIBINTL */
+  if (container_mode > 0) {
+    fprintf(f, " enable_compile_container=\"yes\" force_container=\"yes\"");
+  }
+  fprintf(f, ">\n");
 
   cur = &path_edit_items[PATH_LINE_SOCKET_PATH];
   if (cur->default_value && !strcmp(cur->default_value, cur->buf)) {
@@ -3745,7 +3747,7 @@ do_preview_menu(void)
     case 1:
       snprintf(preview_header, sizeof(preview_header),
                "To be installed to %s", config_ejudge_xml_path);
-      generate_ejudge_xml(f);
+      generate_ejudge_xml(f, 0);
       break;
     case 2:
       snprintf(preview_header, sizeof(preview_header),
@@ -3907,7 +3909,7 @@ const unsigned char b64_contest1_tgz[] =
   ;
 
 static void
-generate_install_script(FILE *f, int batch_install_script)
+generate_install_script(FILE *f, int batch_install_script, int container_mode)
 {
   FILE *floc = 0, *ff = 0;
   char *txt_ptr = 0;
@@ -4104,7 +4106,7 @@ generate_install_script(FILE *f, int batch_install_script)
           "echo \"%s already exists, not overwriting\" 1>&2\n"
           "else\n", config_ejudge_xml_path, config_ejudge_xml_path);
   floc = open_memstream(&txt_ptr, &txt_len);
-  generate_ejudge_xml(floc);
+  generate_ejudge_xml(floc, container_mode);
   close_memstream(floc); floc = 0;
   snprintf(fpath, sizeof(fpath), "%s", config_ejudge_xml_path);
   fprintf(f, "# copy ejudge.xml to its location\n");
@@ -4430,15 +4432,18 @@ preview_install_script(void)
   if (check_install_script_validity() < 0) return;
 
   f = open_memstream(&txt_ptr, &txt_len);
-  generate_install_script(f, 0);
+  generate_install_script(f, 0, 0);
   close_memstream(f); f = 0;
   ncurses_view_text("Setup script preview", txt_ptr);
   free(txt_ptr); txt_ptr = 0; txt_len = 0;
 }
 
 static void
-save_install_script(int batch_mode, const unsigned char *output_name,
-                    int batch_install_script)
+save_install_script(
+        int batch_mode,
+        const unsigned char *output_name,
+        int batch_install_script,
+        int container_mode)
 {
   FILE *f = 0;
   char *txt_ptr = 0, *p;
@@ -4463,7 +4468,7 @@ save_install_script(int batch_mode, const unsigned char *output_name,
   if (check_install_script_validity() < 0) return;
 
   f = open_memstream(&txt_ptr, &txt_len);
-  generate_install_script(f, batch_install_script);
+  generate_install_script(f, batch_install_script, container_mode);
   close_memstream(f); f = 0;
 
   if (output_name && *output_name) {
@@ -4596,7 +4601,7 @@ do_main_menu(void)
       preview_install_script();
       break;
     case 7:
-      save_install_script(0, NULL, 0);
+      save_install_script(0, NULL, 0, 0);
       break;
     }
   }
@@ -4723,6 +4728,7 @@ main(int argc, char **argv)
   const unsigned char *user = 0, *group = 0, *workdir = 0;
   int batch_mode = 0;
   int batch_install_script = 0;
+  int container_mode = 0;
 
   while (cur_arg < argc) {
     if (!strcmp(argv[cur_arg], "-u")) {
@@ -4743,6 +4749,9 @@ main(int argc, char **argv)
     } else if (!strcmp(argv[cur_arg], "-B")) {
       batch_install_script = 1;
       cur_arg += 1;
+    } else if (!strcmp(argv[cur_arg], "-s")) {
+      container_mode = 1;
+      cur_arg += 1;
     } else if (!strcmp(argv[cur_arg], "-i")) {
       if (cur_arg + 1 >= argc) arg_expected(argv[0]);
       lang_ids_file = argv[cur_arg + 1];
@@ -4784,7 +4793,8 @@ main(int argc, char **argv)
     snprintf(config_email, sizeof(config_email), "%s", "ejudge@localhost");
     snprintf(config_name, sizeof(config_name), "%s", "ejudge administrator");
     make_sha1_passwd(config_password_sha1, "ejudge");
-    save_install_script(1, "ejudge-install.sh", batch_install_script);
+    save_install_script(1, "ejudge-install.sh", batch_install_script,
+                        container_mode);
   } else {
     //answer = ncurses_yesno(0, initial_warning);
     make_sha1_passwd(config_password_sha1, "ejudge");

docker/build.sh

@@ -24,6 +24,13 @@ RELEASE='RELEASE=1'
 > ejudge-install.sh
 chmod 755 ejudge-install.sh
 chown ejudge:ejudge ejudge-install.sh
-./ejudge-setup -u ejudge -g ejudge -b -B
+./ejudge-setup -u ejudge -g ejudge -b -B -s
 cp -p ejudge-install.sh /opt/ejudge/bin
 cp docker/httpd.conf /etc/httpd/conf
+
+wget https://ejudge.ru/download/ejudge-container-fedora-36.tbz
+mv ejudge-container-fedora-36.tbz /opt/ejudge/share/ejudge
+tar -C /opt/ejudge/share/ejudge xf /opt/ejudge/share/ejudge/ejudge-container-fedora-36.tbz
+rm /opt/ejudge/share/ejudge/ejudge-container-fedora-36.tbz
+cp -p /etc/passwd /opt/ejudge/share/ejudge/container/etc
+cp -p /etc/group /opt/ejudge/share/ejudge/container/etc