From ef8815f30617e79cfba4909ffd7aadd620dbcad8 Mon Sep 17 00:00:00 2001
From: Alexander Bentkamp <bentkamp@gmail.com>
Date: Mon, 15 May 2023 12:44:38 +0200
Subject: [PATCH] use only lower case docker image names

---
 package.json      | 4 ++--
 server/import.mjs | 2 +-
 server/index.mjs  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index a1c99c5..5b70f08 100644
--- a/package.json
+++ b/package.json
@@ -68,8 +68,8 @@
     "start_client": "NODE_ENV=development webpack-dev-server --hot",
     "build": "NODE_ENV=production webpack",
     "production": "NODE_ENV=production node server/index.mjs",
-    "build_robo": "rm -rf ./Robo && git clone https://github.com/hhu-adam/Robo && docker build ./Robo --file ./Robo/Dockerfile --tag github-hhu-adam:Robo && rm -rf ./Robo",
-    "build_nng": "rm -rf ./NNG4 && git clone https://github.com/hhu-adam/NNG4 && docker build ./NNG4 --file ./NNG4/Dockerfile --tag github-hhu-adam:NNG4 && rm -rf ./NNG4",
+    "build_robo": "rm -rf ./Robo && git clone https://github.com/hhu-adam/Robo && docker build ./Robo --file ./Robo/Dockerfile --tag g/hhu-adam/robo && rm -rf ./Robo",
+    "build_nng": "rm -rf ./NNG4 && git clone https://github.com/hhu-adam/NNG4 && docker build ./NNG4 --file ./NNG4/Dockerfile --tag g/hhu-adam/nng4 && rm -rf ./NNG4",
     "update_lean": "./UPDATE_LEAN.sh"
   },
   "eslintConfig": {
diff --git a/server/import.mjs b/server/import.mjs
index 42102cb..d2aa9bd 100644
--- a/server/import.mjs
+++ b/server/import.mjs
@@ -87,7 +87,7 @@ async function doImport (owner, repo, id) {
     if (manifest.length !== 1) {
       throw `Unexpected manifest: ${JSON.stringify(manifest)}`
     }
-    manifest[0].RepoTags = [`github-${owner?.toString().toLowerCase()}:${repo}`]
+    manifest[0].RepoTags = [`g/${owner.toLowerCase()}/${repo.toLowerCase()}`]
     fs.writeFileSync(`tmp/artifact_${artifactId}_inner/manifest.json`, JSON.stringify(manifest));
     await runProcess(id, "tar", ["-cvf", `../archive_${artifactId}.tar`, "."], `tmp/artifact_${artifactId}_inner/`)
     await runProcess(id, "docker", ["load", "-i", `tmp/archive_${artifactId}.tar`])
diff --git a/server/index.mjs b/server/index.mjs
index 1da5346..2c4ad39 100644
--- a/server/index.mjs
+++ b/server/index.mjs
@@ -16,13 +16,13 @@ import { importTrigger, importStatus } from './import.mjs'
  * use a project directory instead of a docker container.
 */
 const games = {
-    "github-hhu-adam:Robo": {
+    "g/hhu-adam/robo": {
         name: "Adam",
         module: "Adam",
         dir: "../../../../Robo",
         queueLength: 5
     },
-    "github-hhu-adam:NNG4": {
+    "g/hhu-adam/nng4": {
         name: "NNG",
         module: "NNG",
         dir: "../../../../NNG4",
@@ -101,7 +101,7 @@ wss.addListener("connection", function(ws, req) {
     if (!reRes) { console.error(`Connection refused because of invalid URL: ${req.url}`); return; }
     const owner = reRes[1]
     const repo = reRes[2]
-    const tag = `github-${owner}:${repo}`
+    const tag = `g/${owner.toLowerCase()}/${repo.toLowerCase()}`
 
     let ps;
     if (!queue[tag] || queue[tag].length == 0) {