Skip to content

Commit 1f132e5

Browse files
yapishuyapishu
committed
add manual
1 parent 1f61dd9 commit 1f132e5

File tree

3 files changed

+139
-52
lines changed

3 files changed

+139
-52
lines changed

‎README.md‎

Lines changed: 68 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,62 @@ Caches data in sqlite db.
99
```json
1010
{
1111
"groundseg": {
12+
"canary": {
13+
"groundseg": {
14+
"amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
15+
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_latest",
16+
"arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
17+
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_latest",
18+
"major": 1,
19+
"minor": 1,
20+
"patch": 18
21+
},
22+
"minio": {
23+
"amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
24+
"arm64_sha256": "567779c9f29aca670f84d066051290faeaae6c3ad3a3b7062de4936aaab2a29d",
25+
"repo": "registry.hub.docker.com/minio/minio",
26+
"tag": "latest"
27+
},
28+
"miniomc": {
29+
"amd64_sha256": "6ffd76764e8ca484de12c6ecaa352db3d8efd5c9d44f393718b29b6600e0a559",
30+
"arm64_sha256": "6825aecd2f123c9d4408e660aba8a72f9e547a3774350b8f4d2d9b674e99e424",
31+
"repo": "registry.hub.docker.com/minio/mc",
32+
"tag": "latest"
33+
},
34+
"netdata": {
35+
"amd64_sha256": "95e74c36f15091bcd7983ee162248f1f91c21207c235fce6b0d6f8ed9a11732a",
36+
"arm64_sha256": "cd3dc9d182a4561b162f03c6986f4647bbb704f8e7e4872ee0611b1b9e86e1b0",
37+
"repo": "registry.hub.docker.com/netdata/netdata",
38+
"tag": "latest"
39+
},
40+
"vere": {
41+
"amd64_sha256": "6ece7c64c4396dd3ca9db4044d2c029c1ab8869f05e046241f81174ba4b949a2",
42+
"arm64_sha256": null,
43+
"repo": "registry.hub.docker.com/nativeplanet/urbit",
44+
"tag": "edge"
45+
},
46+
"webui": {
47+
"amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
48+
"arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
49+
"repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
50+
"tag": "latest"
51+
},
52+
"wireguard": {
53+
"amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
54+
"arm64_sha256": "403d741b1b5bcf5df1e48eab0af8038355fae3e29419ad5980428f9aebd1576c",
55+
"repo": "registry.hub.docker.com/linuxserver/wireguard",
56+
"tag": "latest"
57+
}
58+
},
1259
"edge": {
1360
"groundseg": {
14-
"amd64_sha256": "3472a6d15793f5b1a38cb303efa2e362f8610d27557504772a569ca4e2499414",
15-
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_edge-v1.1.3_edge",
16-
"arm64_sha256": "e062f5604962dc0724893dd7510d59b4e8ed273bbf8a149126db2b5f7e830841",
17-
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_edge-v1.1.3_edge",
61+
"amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
62+
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_edge",
63+
"arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
64+
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_edge",
1865
"major": 1,
1966
"minor": 1,
20-
"patch": 3
67+
"patch": 18
2168
},
2269
"minio": {
2370
"amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -38,14 +85,14 @@ Caches data in sqlite db.
3885
"tag": "latest"
3986
},
4087
"vere": {
41-
"amd64_sha256": "8a407ed5cdf1a1dfd5d096eba33d3ba989e36f7eed9d941642eec8cd459a2276",
42-
"arm64_sha256": "9adc440389ede681e65e049bdebff33fa8e4c5ec20c728343d74b76b96d5e587",
88+
"amd64_sha256": "44b188a9c465b9eedd9f2a091a5c31235ed1c729499f9449902974a8a1e3007b",
89+
"arm64_sha256": "b1de9cba6ab695999cf4925b14a5208ddb0f2217e7e9f8f0a7db09bf1d69f118",
4390
"repo": "registry.hub.docker.com/nativeplanet/urbit",
44-
"tag": "v1.22"
91+
"tag": "v2.1"
4592
},
4693
"webui": {
47-
"amd64_sha256": "f6348dd4174deae2ce8ad81e32171278b7d5e4cae2ff08cf1f834bdc5cc1621f",
48-
"arm64_sha256": "8c47e40b71e6c6c6788d7105e92b1bc7fc3fb72dfcef47f9d4d007d08c529785",
94+
"amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
95+
"arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
4996
"repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
5097
"tag": "edge"
5198
},
@@ -58,13 +105,13 @@ Caches data in sqlite db.
58105
},
59106
"latest": {
60107
"groundseg": {
61-
"amd64_sha256": "fc89fca9df2c0cda2e4435cb58e07ce8eb7b564577033383c8949e0efe6955d6",
62-
"amd64_url": "https://bin.infra.native.computer/groundseg_amd64_v1.0.8_latest",
63-
"arm64_sha256": "b3894158f295269f2d12ee3e9039248272c5879df43005a876ba99c43de940d1",
64-
"arm64_url": "https://bin.infra.native.computer/groundseg_arm64_v1.0.8_latest",
108+
"amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
109+
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_latest",
110+
"arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
111+
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_latest",
65112
"major": 1,
66-
"minor": 0,
67-
"patch": 8
113+
"minor": 1,
114+
"patch": 18
68115
},
69116
"minio": {
70117
"amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -85,14 +132,14 @@ Caches data in sqlite db.
85132
"tag": "latest"
86133
},
87134
"vere": {
88-
"amd64_sha256": "99b811d0ff5dfe70e9bca79d852ccb16b4b598587a8b75ea7b7580ca53b34cbc",
89-
"arm64_sha256": "cf98ad81eeada04262383333380f5cd1f88c26c47c65275c360f300b6ed6f784",
135+
"amd64_sha256": "8c759f85d43168c0afaf550c0a4a614445d34838b710db7ad6fc7d61b0abc96a",
136+
"arm64_sha256": "b28e760c4e4f3bd0f6bf7604dc7a4a01751cb058c0b10a5c769419eda756a147",
90137
"repo": "registry.hub.docker.com/nativeplanet/urbit",
91-
"tag": "v1.21"
138+
"tag": "v2.1"
92139
},
93140
"webui": {
94-
"amd64_sha256": "226335a6c3b41046cd4122a1c8cddd66b75ea76efca39de7b04be684ea2354ec",
95-
"arm64_sha256": "fdf3592698b60956e8a78ca7f8c70346268be955a5522b39a4c36eb20aa37f91",
141+
"amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
142+
"arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
96143
"repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
97144
"tag": "latest"
98145
},

‎app/db.py‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
repo TEXT NULL, tag TEXT NULL, amd64_sha256 TEXT NULL, \
4040
arm64_sha256 TEXT NULL, last_mod TIMESTAMP NULL, \
4141
PRIMARY KEY ("uid" AUTOINCREMENT) );')
42+
conn.execute('CREATE TABLE IF NOT EXISTS manual (uid INTEGER, \
43+
repo TEXT NULL, tag TEXT NULL, amd64_sha256 TEXT NULL, \
44+
arm64_sha256 TEXT NULL, last_mod TIMESTAMP NULL, \
45+
PRIMARY KEY ("uid" AUTOINCREMENT) );')
4246
conn.commit()
4347
conn.close()
4448

@@ -141,6 +145,12 @@ def generate_content():
141145
'tag': get_value('latest','wireguard','tag'),
142146
'amd64_sha256': get_value('latest','wireguard','amd64_sha256'),
143147
'arm64_sha256': get_value('latest','wireguard','arm64_sha256')
148+
},
149+
'manual': {
150+
'repo': get_value('latest','manual','repo'),
151+
'tag': get_value('latest','manual','tag'),
152+
'amd64_sha256': get_value('latest','manual','amd64_sha256'),
153+
'arm64_sha256': get_value('latest','manual','arm64_sha256')
144154
}
145155
},
146156
'edge': {
@@ -188,6 +198,12 @@ def generate_content():
188198
'tag': get_value('edge','wireguard','tag'),
189199
'amd64_sha256': get_value('edge','wireguard','amd64_sha256'),
190200
'arm64_sha256': get_value('edge','wireguard','arm64_sha256')
201+
},
202+
'manual': {
203+
'repo': get_value('edge','manual','repo'),
204+
'tag': get_value('edge','manual','tag'),
205+
'amd64_sha256': get_value('edge','manual','amd64_sha256'),
206+
'arm64_sha256': get_value('edge','manual','arm64_sha256')
191207
}
192208
},
193209
'canary': {
@@ -235,6 +251,12 @@ def generate_content():
235251
'tag': get_value('canary','wireguard','tag'),
236252
'amd64_sha256': get_value('canary','wireguard','amd64_sha256'),
237253
'arm64_sha256': get_value('canary','wireguard','arm64_sha256')
254+
},
255+
'manual': {
256+
'repo': get_value('canary','manual','repo'),
257+
'tag': get_value('canary','manual','tag'),
258+
'amd64_sha256': get_value('canary','manual','amd64_sha256'),
259+
'arm64_sha256': get_value('canary','manual','arm64_sha256')
238260
}
239261
}
240262
}
@@ -257,7 +279,7 @@ def default_vals():
257279

258280
# Create rows if empty db
259281
# if extending schema, change to new table name
260-
nullcheck = get_value('canary','netdata','uid')
282+
nullcheck = get_value('canary','manual','uid')
261283
if nullcheck == None:
262284
f = open('/app/default_vals.json')
263285
d = json.load(f)

‎app/default_vals.json‎

Lines changed: 48 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
"groundseg": {
33
"canary": {
44
"groundseg": {
5-
"amd64_sha256": "a52af2f27996c816568b6ca528235d415288b897c37401d0362f9467aa9d14de",
6-
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.12_edge",
7-
"arm64_sha256": "7e1192ba0be6c182a1d962feebb8859d153a5ddd5e7e178edf2e78e965e67449",
8-
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.12_edge",
5+
"amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
6+
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_latest",
7+
"arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
8+
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_latest",
99
"major": 1,
1010
"minor": 1,
11-
"patch": 12
11+
"patch": 18
12+
},
13+
"manual": {
14+
"amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
15+
"arm64_sha256": "403d741b1b5bcf5df1e48eab0af8038355fae3e29419ad5980428f9aebd1576c",
16+
"repo": "registry.hub.docker.com/nativeplanet/groundseg-manual",
17+
"tag": "latest"
1218
},
1319
"minio": {
1420
"amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -29,16 +35,16 @@
2935
"tag": "latest"
3036
},
3137
"vere": {
32-
"amd64_sha256": "754d112043e0d7d23ea49c82d8835563767900f077cf690beba93ccf06113827",
38+
"amd64_sha256": "6ece7c64c4396dd3ca9db4044d2c029c1ab8869f05e046241f81174ba4b949a2",
3339
"arm64_sha256": null,
34-
"repo": "registry.hub.docker.com/tloncorp/vere",
40+
"repo": "registry.hub.docker.com/nativeplanet/urbit",
3541
"tag": "edge"
3642
},
3743
"webui": {
38-
"amd64_sha256": "2128445f0684f6600b8f8fc3d5c9a1a785f7ad583b98243376c1b28949cbd96f",
39-
"arm64_sha256": "4750c640cc44ffd209a939f55f20365e62c062833b739503a5d4f493c6766eff",
44+
"amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
45+
"arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
4046
"repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
41-
"tag": "edge"
47+
"tag": "latest"
4248
},
4349
"wireguard": {
4450
"amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
@@ -49,13 +55,19 @@
4955
},
5056
"edge": {
5157
"groundseg": {
52-
"amd64_sha256": "a52af2f27996c816568b6ca528235d415288b897c37401d0362f9467aa9d14de",
53-
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.12_edge",
54-
"arm64_sha256": "7e1192ba0be6c182a1d962feebb8859d153a5ddd5e7e178edf2e78e965e67449",
55-
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.12_edge",
58+
"amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
59+
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_edge",
60+
"arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
61+
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_edge",
5662
"major": 1,
5763
"minor": 1,
58-
"patch": 12
64+
"patch": 18
65+
},
66+
"manual": {
67+
"amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
68+
"arm64_sha256": "403d741b1b5bcf5df1e48eab0af8038355fae3e29419ad5980428f9aebd1576c",
69+
"repo": "registry.hub.docker.com/nativeplanet/groundseg-manual",
70+
"tag": "edge"
5971
},
6072
"minio": {
6173
"amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -76,14 +88,14 @@
7688
"tag": "latest"
7789
},
7890
"vere": {
79-
"amd64_sha256": "e1fadc3da1a0bbaf7d938580f823db687c0dfff2e5ac6dad51b71c32ec3f988d",
80-
"arm64_sha256": "51bfff713d3147951f6967effda047f5f2f4193701d37b65d075bd2363175282",
91+
"amd64_sha256": "44b188a9c465b9eedd9f2a091a5c31235ed1c729499f9449902974a8a1e3007b",
92+
"arm64_sha256": "b1de9cba6ab695999cf4925b14a5208ddb0f2217e7e9f8f0a7db09bf1d69f118",
8193
"repo": "registry.hub.docker.com/nativeplanet/urbit",
82-
"tag": "v2.0"
94+
"tag": "v2.1"
8395
},
8496
"webui": {
85-
"amd64_sha256": "2128445f0684f6600b8f8fc3d5c9a1a785f7ad583b98243376c1b28949cbd96f",
86-
"arm64_sha256": "4750c640cc44ffd209a939f55f20365e62c062833b739503a5d4f493c6766eff",
97+
"amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
98+
"arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
8799
"repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
88100
"tag": "edge"
89101
},
@@ -96,13 +108,19 @@
96108
},
97109
"latest": {
98110
"groundseg": {
99-
"amd64_sha256": "a52af2f27996c816568b6ca528235d415288b897c37401d0362f9467aa9d14de",
100-
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.12_latest",
101-
"arm64_sha256": "7e1192ba0be6c182a1d962feebb8859d153a5ddd5e7e178edf2e78e965e67449",
102-
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.12_latest",
111+
"amd64_sha256": "e486d6000c109fc15a3b5c3328d297042daf26c306fac0cc1072fd2f4426f49a",
112+
"amd64_url": "https://files.native.computer/bin/groundseg_amd64_rc2-v1.1.18_latest",
113+
"arm64_sha256": "4e48526d0891aebe3de3e79a61f3581d7b0b45b04f76aafb3aa3b88e5e1e3f52",
114+
"arm64_url": "https://files.native.computer/bin/groundseg_arm64_rc2-v1.1.18_latest",
103115
"major": 1,
104116
"minor": 1,
105-
"patch": 12
117+
"patch": 18
118+
},
119+
"manual": {
120+
"amd64_sha256": "ae6f8e8cc1303bc9c0b5fa1b1ef4176c25a2c082e29bf8b554ce1196731e7db2",
121+
"arm64_sha256": "403d741b1b5bcf5df1e48eab0af8038355fae3e29419ad5980428f9aebd1576c",
122+
"repo": "registry.hub.docker.com/nativeplanet/groundseg-manual",
123+
"tag": "latest"
106124
},
107125
"minio": {
108126
"amd64_sha256": "f6a3001a765dc59a8e365149ade0ea628494230e984891877ead016eb24ba9a9",
@@ -123,14 +141,14 @@
123141
"tag": "latest"
124142
},
125143
"vere": {
126-
"amd64_sha256": "8bd616e0815ec8aef447ebc8b0c604d286fa4fb3528aa6b380a785de13f6f933",
127-
"arm64_sha256": "44431c6a1ef47045f86073b2a3a3214b55c15c9a4f22edf701a8be17ab82d95e",
144+
"amd64_sha256": "8c759f85d43168c0afaf550c0a4a614445d34838b710db7ad6fc7d61b0abc96a",
145+
"arm64_sha256": "b28e760c4e4f3bd0f6bf7604dc7a4a01751cb058c0b10a5c769419eda756a147",
128146
"repo": "registry.hub.docker.com/nativeplanet/urbit",
129-
"tag": "v2.0"
147+
"tag": "v2.1"
130148
},
131149
"webui": {
132-
"amd64_sha256": "2128445f0684f6600b8f8fc3d5c9a1a785f7ad583b98243376c1b28949cbd96f",
133-
"arm64_sha256": "4750c640cc44ffd209a939f55f20365e62c062833b739503a5d4f493c6766eff",
150+
"amd64_sha256": "a814c8e6e1b2095e818e2432710eeed45378fb83e6b818961379885c8d587b21",
151+
"arm64_sha256": "b52b1735eb88aa0da5d00b0898bc358b41de2cdf31f54ac6b8885902ceb913b9",
134152
"repo": "registry.hub.docker.com/nativeplanet/groundseg-webui",
135153
"tag": "latest"
136154
},

0 commit comments

Comments
 (0)