Skip to content

Commit 82870df

Browse files
committed
update hub to hub.grid.tf again
1 parent 056f9b8 commit 82870df

File tree

6 files changed

+37
-37
lines changed

6 files changed

+37
-37
lines changed

bootstrap/bootstrap/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ will do a multiple stage bootstrap. Currently this is only two stages:
1919
- Bootstrap is used by [0-initramfs](https://github.com/threefoldtech/0-initramfs/blob/development-zos-v3/packages/modules.sh) to basically add `internet` and `bootstrap` services to the base image
2020
- After internet service is fully started, bootstrap will start to download flists needed for zos node to work properly
2121
- As described above bootstrap run in two stages:
22-
- The first stage is used to update bootstrap itself, and it is done like that to avoid re-building the image if we only changed the bootstrap code. this update is basically done from `tf-autobuilder` repo in the [hub/tf-autobuilder](https://hub.threefold.me/tf-autobuilder) and download the latest bootstrap flist
23-
- For the second stage bootstrap will download the flists for that env. bootstrap cares about `runmode` argument that we pass during the start of the node. for example if we passed `runmode=dev` it will get the the tag `development` under [hub/tf-zos](https://hub.threefold.me/tf-zos) each tag is linked to a sub-directory where all flists for this env exists to be downloaded and installed on the node
22+
- The first stage is used to update bootstrap itself, and it is done like that to avoid re-building the image if we only changed the bootstrap code. this update is basically done from `tf-autobuilder` repo in the [hub/tf-autobuilder](https://hub.grid.tf/tf-autobuilder) and download the latest bootstrap flist
23+
- For the second stage bootstrap will download the flists for that env. bootstrap cares about `runmode` argument that we pass during the start of the node. for example if we passed `runmode=dev` it will get the the tag `development` under [hub/tf-zos](https://hub.grid.tf/tf-zos) each tag is linked to a sub-directory where all flists for this env exists to be downloaded and installed on the node
2424

2525
## Testing in Developer setup
2626

@@ -40,6 +40,6 @@ after:
4040
- internet
4141
```
4242

43-
- remove overlay link under `qemu/overlay`
43+
- remove overlay link under `qemu/overlay `
4444
- create a new link pointing to overlay.custom under zos/qemu `ln -s overlay.custom overlay`
4545
- boot your vm as normal

bootstrap/bootstrap/src/hub.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::fs::{write, OpenOptions};
66
use std::io::copy;
77
use std::path::Path;
88

9-
const HUB: &str = "https://hub.threefold.me";
9+
const HUB: &str = "https://hub.grid.tf";
1010

1111
pub struct Repo {
1212
name: String,
@@ -172,7 +172,7 @@ mod tests {
172172
let flist = repo.get("test.flist")?;
173173
assert_eq!(flist.name, "test.flist");
174174
assert_eq!(flist.kind, Kind::Regular);
175-
assert_eq!(flist.url, "https://hub.threefold.me/azmy/test.flist");
175+
assert_eq!(flist.url, "https://hub.grid.tf/azmy/test.flist");
176176

177177
Ok(())
178178
}
@@ -227,7 +227,7 @@ mod tests {
227227

228228
let found = found.unwrap();
229229
assert_eq!(found.name, "test.flist");
230-
assert_eq!(found.url, "https://hub.threefold.me/azmy/test.flist");
230+
assert_eq!(found.url, "https://hub.grid.tf/azmy/test.flist");
231231

232232
Ok(())
233233
}

pkg/container/README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,43 @@ the container rootfs
1414
package main
1515

1616
import (
17-
"github.com/threefoldtech/zbus"
18-
"github.com/threefoldtech/zosbase/pkg"
19-
"github.com/threefoldtech/zosbase/pkg/stubs"
17+
"github.com/threefoldtech/zbus"
18+
"github.com/threefoldtech/zosbase/pkg"
19+
"github.com/threefoldtech/zosbase/pkg/stubs"
2020
)
2121

2222
func main() {
23-
client, err := zbus.NewRedisClient("tcp://localhost:6379")
24-
if err != nil {
25-
panic(client)
26-
}
23+
client, err := zbus.NewRedisClient("tcp://localhost:6379")
24+
if err != nil {
25+
panic(client)
26+
}
2727

28-
containerd := stubs.NewContainerModuleStub(client)
29-
namespace := "example"
28+
containerd := stubs.NewContainerModuleStub(client)
29+
namespace := "example"
3030

31-
// make sure u have a network namespace ready using ip
32-
// sudo ip netns add mynetns
31+
// make sure u have a network namespace ready using ip
32+
// sudo ip netns add mynetns
3333

34-
info := pkg.Container{
35-
Name: "test",
36-
FList: "https://hub.threefold.me/thabet/redis.flist",
37-
Env: []string{},
38-
Network: pkg.NetworkInfo{Namespace: "mynetns"},
39-
Mounts: nil,
40-
Entrypoint: "redis-server",
41-
}
34+
info := pkg.Container{
35+
Name: "test",
36+
FList: "https://hub.grid.tf/thabet/redis.flist",
37+
Env: []string{},
38+
Network: pkg.NetworkInfo{Namespace: "mynetns"},
39+
Mounts: nil,
40+
Entrypoint: "redis-server",
41+
}
4242

43-
id, err := containerd.Run(namespace, info)
43+
id, err := containerd.Run(namespace, info)
4444

45-
if err != nil {
46-
panic(err)
47-
}
45+
if err != nil {
46+
panic(err)
47+
}
4848

49-
// DO WORK WITH CONTAINER ...
49+
// DO WORK WITH CONTAINER ...
5050

51-
if err = containerd.Delete(namespace, id); err != nil {
52-
panic(err)
53-
}
51+
if err = containerd.Delete(namespace, id); err != nil {
52+
panic(err)
53+
}
5454

5555
}
5656
```

pkg/upgrade/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To run the upgrade module you first need to create a new upgrader instance with
1515
| Option | Description | Default |
1616
| :------------: | :------------------------------------------: | :-------------------: |
1717
| `NoZosUpgrade` | enable or disable the update of zos binaries | enabled by default |
18-
| `Storage` | overrides the default hub storage url | `hub.threefold.me` |
18+
| `Storage` | overrides the default hub storage url | `hub.grid.tf` |
1919
| `Zinit` | overrides the default zinit socket | "/var/run/zinit.sock" |
2020

2121
```go

scripts/debug_image.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sudo -i
1919
./install_deps
2020

2121
# run image from a directory
22-
./debug_image.sh -d --image https://hub.threefold.me/omarabdulaziz.3bot/ubuntu-jammy.flist
22+
./debug_image.sh -d --image https://hub.grid.tf/omarabdulaziz.3bot/ubuntu-jammy.flist
2323
```
2424

2525
## Image Types
@@ -28,7 +28,7 @@ sudo -i
2828
the creation tutorial [here](../docs/manual/zmachine/zmachine.md)
2929

3030
- Container: Contains only the rootfs.
31-
in this case wil use kernel and initramfs from cloud container [flist](https://hub.threefold.me/tf-autobuilder/cloud-container-9dba60e.flist.md)
31+
in this case wil use kernel and initramfs from cloud container [flist](https://hub.grid.tf/tf-autobuilder/cloud-container-9dba60e.flist.md)
3232

3333
## Flags
3434

scripts/debug_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
readonly SOCKET="/tmp/virtiofs.sock"
55
readonly CH_API_SOCKET="/tmp/ch-api.sock"
66
readonly OVERLAYFS="/tmp/overlay"
7-
readonly CCFLIST="https://hub.threefold.me/tf-autobuilder/cloud-container-9dba60e.flist"
7+
readonly CCFLIST="https://hub.grid.tf/tf-autobuilder/cloud-container-9dba60e.flist"
88
readonly MACHINE_TYPE="machine"
99
readonly CONTAINER_TYPE="container"
1010

0 commit comments

Comments
 (0)