add manual

SociOS-Linux · Apr 13, 2023 · 1f132e5 · 1f132e5
1 parent 1f61dd9
commit 1f132e5
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -9,15 +9,62 @@ Caches data in sqlite db.
 ```json
 {
   "groundseg": {
+    "canary": {
+      "groundseg": {
+        "amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
+        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_latest",
+        "arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
+        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_latest",
+        "major": 1,
+        "minor": 1,
+        "patch": 18
+      },
+      "minio": {
+        "amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
+        "arm64_sha256": "567779c9f29aca670f84d066051290faeaae6c3ad3a3b7062de4936aaab2a29d",
+        "repo": "registry.hub.docker.com/minio/minio",
+        "tag": "latest"
+      },
+      "miniomc": {
+        "amd64_sha256": "6ffd76764e8ca484de12c6ecaa352db3d8efd5c9d44f393718b29b6600e0a559",
+        "arm64_sha256": "6825aecd2f123c9d4408e660aba8a72f9e547a3774350b8f4d2d9b674e99e424",
+        "repo": "registry.hub.docker.com/minio/mc",
+        "tag": "latest"
+      },
+      "netdata": {
+        "amd64_sha256": "95e74c36f15091bcd7983ee162248f1f91c21207c235fce6b0d6f8ed9a11732a",
+        "arm64_sha256": "cd3dc9d182a4561b162f03c6986f4647bbb704f8e7e4872ee0611b1b9e86e1b0",
+        "repo": "registry.hub.docker.com/netdata/netdata",
+        "tag": "latest"
+      },
+      "vere": {
+        "amd64_sha256": "6ece7c64c4396dd3ca9db4044d2c029c1ab8869f05e046241f81174ba4b949a2",
+        "arm64_sha256": null,
+        "repo": "registry.hub.docker.com/nativeplanet/urbit",
+        "tag": "edge"
+      },
+      "webui": {
+        "amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
+        "arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
+        "repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
+        "tag": "latest"
+      },
+      "wireguard": {
+        "amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
+        "arm64_sha256": "403d741b1b5bcf5df1e48eab0af8038355fae3e29419ad5980428f9aebd1576c",
+        "repo": "registry.hub.docker.com/linuxserver/wireguard",
+        "tag": "latest"
+      }
+    },
     "edge": {
       "groundseg": {
-        "amd64_sha256": "3472a6d15793f5b1a38cb303efa2e362f8610d27557504772a569ca4e2499414",
-        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_edge-v1.1.3_edge",
-        "arm64_sha256": "e062f5604962dc0724893dd7510d59b4e8ed273bbf8a149126db2b5f7e830841",
-        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_edge-v1.1.3_edge",
+        "amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
+        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_edge",
+        "arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
+        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_edge",
         "major": 1,
         "minor": 1,
-        "patch": 3
+        "patch": 18
       },
       "minio": {
         "amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -38,14 +85,14 @@ Caches data in sqlite db.
         "tag": "latest"
       },
       "vere": {
-        "amd64_sha256": "8a407ed5cdf1a1dfd5d096eba33d3ba989e36f7eed9d941642eec8cd459a2276",
-        "arm64_sha256": "9adc440389ede681e65e049bdebff33fa8e4c5ec20c728343d74b76b96d5e587",
+        "amd64_sha256": "44b188a9c465b9eedd9f2a091a5c31235ed1c729499f9449902974a8a1e3007b",
+        "arm64_sha256": "b1de9cba6ab695999cf4925b14a5208ddb0f2217e7e9f8f0a7db09bf1d69f118",
         "repo": "registry.hub.docker.com/nativeplanet/urbit",
-        "tag": "v1.22"
+        "tag": "v2.1"
       },
       "webui": {
-        "amd64_sha256": "f6348dd4174deae2ce8ad81e32171278b7d5e4cae2ff08cf1f834bdc5cc1621f",
-        "arm64_sha256": "8c47e40b71e6c6c6788d7105e92b1bc7fc3fb72dfcef47f9d4d007d08c529785",
+        "amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
+        "arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
         "repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
         "tag": "edge"
       },
@@ -58,13 +105,13 @@ Caches data in sqlite db.
     },
     "latest": {
       "groundseg": {
-        "amd64_sha256": "fc89fca9df2c0cda2e4435cb58e07ce8eb7b564577033383c8949e0efe6955d6",
-        "amd64_url": "https://bin.infra.native.computer/groundseg_amd64_v1.0.8_latest",
-        "arm64_sha256": "b3894158f295269f2d12ee3e9039248272c5879df43005a876ba99c43de940d1",
-        "arm64_url": "https://bin.infra.native.computer/groundseg_arm64_v1.0.8_latest",
+        "amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
+        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_latest",
+        "arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
+        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_latest",
         "major": 1,
-        "minor": 0,
-        "patch": 8
+        "minor": 1,
+        "patch": 18
       },
       "minio": {
         "amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -85,14 +132,14 @@ Caches data in sqlite db.
         "tag": "latest"
       },
       "vere": {
-        "amd64_sha256": "99b811d0ff5dfe70e9bca79d852ccb16b4b598587a8b75ea7b7580ca53b34cbc",
-        "arm64_sha256": "cf98ad81eeada04262383333380f5cd1f88c26c47c65275c360f300b6ed6f784",
+        "amd64_sha256": "8c759f85d43168c0afaf550c0a4a614445d34838b710db7ad6fc7d61b0abc96a",
+        "arm64_sha256": "b28e760c4e4f3bd0f6bf7604dc7a4a01751cb058c0b10a5c769419eda756a147",
         "repo": "registry.hub.docker.com/nativeplanet/urbit",
-        "tag": "v1.21"
+        "tag": "v2.1"
       },
       "webui": {
-        "amd64_sha256": "226335a6c3b41046cd4122a1c8cddd66b75ea76efca39de7b04be684ea2354ec",
-        "arm64_sha256": "fdf3592698b60956e8a78ca7f8c70346268be955a5522b39a4c36eb20aa37f91",
+        "amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
+        "arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
         "repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
         "tag": "latest"
       },

diff --git a/app/db.py b/app/db.py
@@ -39,6 +39,10 @@
                 repo TEXT NULL, tag TEXT NULL, amd64_sha256 TEXT NULL, \
                 arm64_sha256 TEXT NULL, last_mod TIMESTAMP NULL, \
                 PRIMARY KEY ("uid" AUTOINCREMENT) );')
+    conn.execute('CREATE TABLE IF NOT EXISTS manual (uid INTEGER, \
+                repo TEXT NULL, tag TEXT NULL, amd64_sha256 TEXT NULL, \
+                arm64_sha256 TEXT NULL, last_mod TIMESTAMP NULL, \
+                PRIMARY KEY ("uid" AUTOINCREMENT) );')
     conn.commit()
     conn.close()
 
@@ -141,6 +145,12 @@ def generate_content():
                     'tag': get_value('latest','wireguard','tag'),
                     'amd64_sha256': get_value('latest','wireguard','amd64_sha256'),
                     'arm64_sha256': get_value('latest','wireguard','arm64_sha256')
+                },
+                'manual': {
+                    'repo': get_value('latest','manual','repo'),
+                    'tag': get_value('latest','manual','tag'),
+                    'amd64_sha256': get_value('latest','manual','amd64_sha256'),
+                    'arm64_sha256': get_value('latest','manual','arm64_sha256')
                 }
             },
             'edge': {
@@ -188,6 +198,12 @@ def generate_content():
                     'tag': get_value('edge','wireguard','tag'),
                     'amd64_sha256': get_value('edge','wireguard','amd64_sha256'),
                     'arm64_sha256': get_value('edge','wireguard','arm64_sha256')
+                },
+                'manual': {
+                    'repo': get_value('edge','manual','repo'),
+                    'tag': get_value('edge','manual','tag'),
+                    'amd64_sha256': get_value('edge','manual','amd64_sha256'),
+                    'arm64_sha256': get_value('edge','manual','arm64_sha256')
                 }
             },
             'canary': {
@@ -235,6 +251,12 @@ def generate_content():
                     'tag': get_value('canary','wireguard','tag'),
                     'amd64_sha256': get_value('canary','wireguard','amd64_sha256'),
                     'arm64_sha256': get_value('canary','wireguard','arm64_sha256')
+                },
+                'manual': {
+                    'repo': get_value('canary','manual','repo'),
+                    'tag': get_value('canary','manual','tag'),
+                    'amd64_sha256': get_value('canary','manual','amd64_sha256'),
+                    'arm64_sha256': get_value('canary','manual','arm64_sha256')
                 }
             }
         }
@@ -257,7 +279,7 @@ def default_vals():
 
 # Create rows if empty db
 # if extending schema, change to new table name
-nullcheck = get_value('canary','netdata','uid')
+nullcheck = get_value('canary','manual','uid')
 if nullcheck == None:
     f = open('/app/default_vals.json')
     d = json.load(f)

diff --git a/app/default_vals.json b/app/default_vals.json
@@ -2,13 +2,19 @@
   "groundseg": {
     "canary": {
       "groundseg": {
-        "amd64_sha256": "a52af2f27996c816568b6ca528235d415288b897c37401d0362f9467aa9d14de",
-        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.12_edge",
-        "arm64_sha256": "7e1192ba0be6c182a1d962feebb8859d153a5ddd5e7e178edf2e78e965e67449",
-        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.12_edge",
+        "amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
+        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_latest",
+        "arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
+        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_latest",
         "major": 1,
         "minor": 1,
-        "patch": 12
+        "patch": 18
+      },
+      "manual": {
+        "amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
+        "arm64_sha256": "403d741b1b5bcf5df1e48eab0af8038355fae3e29419ad5980428f9aebd1576c",
+        "repo": "registry.hub.docker.com/nativeplanet/groundseg-manual",
+        "tag": "latest"
       },
       "minio": {
         "amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -29,16 +35,16 @@
         "tag": "latest"
       },
       "vere": {
-        "amd64_sha256": "754d112043e0d7d23ea49c82d8835563767900f077cf690beba93ccf06113827",
+        "amd64_sha256": "6ece7c64c4396dd3ca9db4044d2c029c1ab8869f05e046241f81174ba4b949a2",
         "arm64_sha256": null,
-        "repo": "registry.hub.docker.com/tloncorp/vere",
+        "repo": "registry.hub.docker.com/nativeplanet/urbit",
         "tag": "edge"
       },
       "webui": {
-        "amd64_sha256": "2128445f0684f6600b8f8fc3d5c9a1a785f7ad583b98243376c1b28949cbd96f",
-        "arm64_sha256": "4750c640cc44ffd209a939f55f20365e62c062833b739503a5d4f493c6766eff",
+        "amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
+        "arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
         "repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
-        "tag": "edge"
+        "tag": "latest"
       },
       "wireguard": {
         "amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
@@ -49,13 +55,19 @@
     },
     "edge": {
       "groundseg": {
-        "amd64_sha256": "a52af2f27996c816568b6ca528235d415288b897c37401d0362f9467aa9d14de",
-        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.12_edge",
-        "arm64_sha256": "7e1192ba0be6c182a1d962feebb8859d153a5ddd5e7e178edf2e78e965e67449",
-        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.12_edge",
+        "amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
+        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_edge",
+        "arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
+        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_edge",
         "major": 1,
         "minor": 1,
-        "patch": 12
+        "patch": 18
+      },
+      "manual": {
+        "amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
+        "arm64_sha256": "403d741b1b5bcf5df1e48eab0af8038355fae3e29419ad5980428f9aebd1576c",
+        "repo": "registry.hub.docker.com/nativeplanet/groundseg-manual",
+        "tag": "edge"
       },
       "minio": {
         "amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -76,14 +88,14 @@
         "tag": "latest"
       },
       "vere": {
-        "amd64_sha256": "e1fadc3da1a0bbaf7d938580f823db687c0dfff2e5ac6dad51b71c32ec3f988d",
-        "arm64_sha256": "51bfff713d3147951f6967effda047f5f2f4193701d37b65d075bd2363175282",
+        "amd64_sha256": "44b188a9c465b9eedd9f2a091a5c31235ed1c729499f9449902974a8a1e3007b",
+        "arm64_sha256": "b1de9cba6ab695999cf4925b14a5208ddb0f2217e7e9f8f0a7db09bf1d69f118",
         "repo": "registry.hub.docker.com/nativeplanet/urbit",
-        "tag": "v2.0"
+        "tag": "v2.1"
       },
       "webui": {
-        "amd64_sha256": "2128445f0684f6600b8f8fc3d5c9a1a785f7ad583b98243376c1b28949cbd96f",
-        "arm64_sha256": "4750c640cc44ffd209a939f55f20365e62c062833b739503a5d4f493c6766eff",
+        "amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
+        "arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
         "repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
         "tag": "edge"
       },
@@ -96,13 +108,19 @@
     },
     "latest": {
       "groundseg": {
-        "amd64_sha256": "a52af2f27996c816568b6ca528235d415288b897c37401d0362f9467aa9d14de",
-        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.12_latest",
-        "arm64_sha256": "7e1192ba0be6c182a1d962feebb8859d153a5ddd5e7e178edf2e78e965e67449",
-        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.12_latest",
+        "amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
+        "amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_latest",
+        "arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
+        "arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_latest",
         "major": 1,
         "minor": 1,
-        "patch": 12
+        "patch": 18
+      },
+      "manual": {
+        "amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
+        "arm64_sha256": "403d741b1b5bcf5df1e48eab0af8038355fae3e29419ad5980428f9aebd1576c",
+        "repo": "registry.hub.docker.com/nativeplanet/groundseg-manual",
+        "tag": "latest"
       },
       "minio": {
         "amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -123,14 +141,14 @@
         "tag": "latest"
       },
       "vere": {
-        "amd64_sha256": "8bd616e0815ec8aef447ebc8b0c604d286fa4fb3528aa6b380a785de13f6f933",
-        "arm64_sha256": "44431c6a1ef47045f86073b2a3a3214b55c15c9a4f22edf701a8be17ab82d95e",
+        "amd64_sha256": "8c759f85d43168c0afaf550c0a4a614445d34838b710db7ad6fc7d61b0abc96a",
+        "arm64_sha256": "b28e760c4e4f3bd0f6bf7604dc7a4a01751cb058c0b10a5c769419eda756a147",
         "repo": "registry.hub.docker.com/nativeplanet/urbit",
-        "tag": "v2.0"
+        "tag": "v2.1"
       },
       "webui": {
-        "amd64_sha256": "2128445f0684f6600b8f8fc3d5c9a1a785f7ad583b98243376c1b28949cbd96f",
-        "arm64_sha256": "4750c640cc44ffd209a939f55f20365e62c062833b739503a5d4f493c6766eff",
+        "amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
+        "arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
         "repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
         "tag": "latest"
       },