Skip to content

Commit abcafb9

Browse files
authored
Collect all flists in one file (#3990)
* Collect all flists in one file * Fix types * Update flists.ts * - Refactor flists object - Apply changes on micro and full VMs components * - Update flists keys to be in uppercase - Update solutions to fit the changes * Fix caprover worker flist * Apply renaming flists to gridclient scripts * Update flists -> Flists * Update Funkwhale entry point * Update flists and its entrypoints * Update flists * Rename Flists => FLISTS * Refactor flists call
1 parent 4b97c45 commit abcafb9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+340
-269
lines changed

packages/grid_client/scripts/applications/algorand.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { FilterOptions, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -63,8 +64,8 @@ async function main() {
6364
cpu: instanceCapacity.cru,
6465
memory: 1024 * instanceCapacity.mru,
6566
rootfs_size: 0,
66-
flist: "https://hub.grid.tf/tf-official-apps/algorand-latest.flist",
67-
entrypoint: "/sbin/zinit init",
67+
flist: FLISTS.ALGORAND.value,
68+
entrypoint: FLISTS.ALGORAND.entryPoint,
6869
env: {
6970
SSH_KEY: config.ssh_key,
7071
// Select a network to work against.

packages/grid_client/scripts/applications/casperlabs.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -91,8 +92,8 @@ async function main() {
9192
cpu: instanceCapacity.cru,
9293
memory: 1024 * instanceCapacity.mru,
9394
rootfs_size: 0,
94-
flist: "https://hub.grid.tf/tf-official-apps/casperlabs-latest.flist",
95-
entrypoint: "/sbin/zinit init",
95+
flist: FLISTS.CASPERLABS.value,
96+
entrypoint: FLISTS.CASPERLABS.entryPoint,
9697
env: {
9798
SSH_KEY: config.ssh_key,
9899
CASPERLABS_HOSTNAME: domain,

packages/grid_client/scripts/applications/discourse.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { Buffer } from "buffer";
22
import TweetNACL from "tweetnacl";
33

44
import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
5+
import { FLISTS } from "../../src/helpers/flists";
56
import { config, getClient } from "../client_loader";
67
import { log, pingNodes } from "../utils";
78

@@ -99,8 +100,8 @@ async function main() {
99100
cpu: instanceCapacity.cru,
100101
memory: 1024 * instanceCapacity.mru,
101102
rootfs_size: 0,
102-
flist: "https://hub.grid.tf/tf-official-apps/forum-docker-v3.1.2.flist",
103-
entrypoint: "/sbin/zinit init",
103+
flist: FLISTS.DISCOURSE.value,
104+
entrypoint: FLISTS.DISCOURSE.entryPoint,
104105
env: {
105106
SSH_KEY: config.ssh_key,
106107
DISCOURSE_HOSTNAME: domain,

packages/grid_client/scripts/applications/funkwhale.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -91,8 +92,8 @@ async function main() {
9192
cpu: instanceCapacity.cru,
9293
memory: 1024 * instanceCapacity.mru,
9394
rootfs_size: 0,
94-
flist: "https://hub.grid.tf/tf-official-apps/funkwhale-dec21.flist",
95-
entrypoint: "/init.sh",
95+
flist: FLISTS.FUNKWHALE.value,
96+
entrypoint: FLISTS.FUNKWHALE.entryPoint,
9697
env: {
9798
SSH_KEY: config.ssh_key,
9899
FUNKWHALE_HOSTNAME: domain,

packages/grid_client/scripts/applications/gitea.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -93,8 +94,8 @@ async function main() {
9394
cpu: instanceCapacity.cru,
9495
memory: 1024 * instanceCapacity.mru,
9596
rootfs_size: 0,
96-
flist: "https://hub.grid.tf/petep.3bot/threefolddev-gitea-latest.flist",
97-
entrypoint: "/sbin/zinit init",
97+
flist: FLISTS.GITEA.value,
98+
entrypoint: FLISTS.GITEA.entryPoint,
9899
env: {
99100
SSH_KEY: config.ssh_key,
100101
GITEA__HOSTNAME: domain,

packages/grid_client/scripts/applications/jenkins.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -90,8 +91,8 @@ async function main() {
9091
cpu: instanceCapacity.cru,
9192
memory: 1024 * instanceCapacity.mru,
9293
rootfs_size: 0,
93-
flist: "https://hub.grid.tf/tf-official-apps/jenkins-latest.flist",
94-
entrypoint: "/sbin/zinit init",
94+
flist: FLISTS.JENKINS.value,
95+
entrypoint: FLISTS.JENKINS.entryPoint,
9596
env: {
9697
SSH_KEY: config.ssh_key,
9798
JENKINS_HOSTNAME: domain,

packages/grid_client/scripts/applications/jitsi.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -90,8 +91,8 @@ async function main() {
9091
cpu: instanceCapacity.cru,
9192
memory: 1024 * instanceCapacity.mru,
9293
rootfs_size: 0,
93-
flist: "https://hub.grid.tf/tf-official-apps/jitsi-latest.flist",
94-
entrypoint: "/sbin/zinit init",
94+
flist: FLISTS.JITSI.value,
95+
entrypoint: FLISTS.JITSI.entryPoint,
9596
env: {
9697
SSH_KEY: config.ssh_key,
9798
JITSI_HOSTNAME: domain,

packages/grid_client/scripts/applications/mattermost.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -93,8 +94,8 @@ async function main() {
9394
cpu: instanceCapacity.cru,
9495
memory: 1024 * instanceCapacity.mru,
9596
rootfs_size: 0,
96-
flist: "https://hub.grid.tf/tf-official-apps/mattermost-latest.flist",
97-
entrypoint: "/sbin/zinit init",
97+
flist: FLISTS.MATTERMOST.value,
98+
entrypoint: FLISTS.MATTERMOST.entryPoint,
9899
env: {
99100
SSH_KEY: config.ssh_key,
100101
MATTERMOST_DOMAIN: domain,

packages/grid_client/scripts/applications/nextcloud.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Features, FilterOptions, GatewayNameModel, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -91,8 +92,8 @@ async function main() {
9192
cpu: instanceCapacity.cru,
9293
memory: 1024 * instanceCapacity.mru,
9394
rootfs_size: 0,
94-
flist: "https://hub.grid.tf/tf-official-apps/threefoldtech-nextcloudaio-latest.flist",
95-
entrypoint: "/sbin/zinit init",
95+
flist: FLISTS.NEXTCLOUD.value,
96+
entrypoint: FLISTS.NEXTCLOUD.entryPoint,
9697
env: {
9798
SSH_KEY: config.ssh_key,
9899
NEXTCLOUD_DOMAIN: domain,

packages/grid_client/scripts/applications/nodepilot.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Features, FilterOptions, MachinesModel } from "../../src";
2+
import { FLISTS } from "../../src/helpers/flists";
23
import { config, getClient } from "../client_loader";
34
import { log, pingNodes } from "../utils";
45

@@ -69,8 +70,8 @@ async function main() {
6970
cpu: instanceCapacity.cru,
7071
memory: 1024 * instanceCapacity.mru,
7172
rootfs_size: 2,
72-
flist: "https://hub.grid.tf/tf-official-vms/node-pilot-zdbfs.flist",
73-
entrypoint: "/",
73+
flist: FLISTS.NODEPILOT.value,
74+
entrypoint: FLISTS.NODEPILOT.entryPoint,
7475
env: {
7576
SSH_KEY: config.ssh_key,
7677
},

0 commit comments

Comments
 (0)