From a7ea35fd50a7506022051c31336afd9f6501bf97 Mon Sep 17 00:00:00 2001 From: Rishi-k-s Date: Sun, 12 Apr 2026 17:54:20 +0530 Subject: [PATCH 1/2] docs: add containers README and fix YAML formatting - Add comprehensive README for containers.yml with setup workflow - Fix YAML indentation error in Devadath entry - Resolve port collision (2224 -> 2225 for member-devadath) - Update root README with git workflow instructions --- README.md | 98 +++++++++++++++++++++++++++++++++++++++ containers/containers.yml | 10 ++-- 2 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..fb2bc57 --- /dev/null +++ b/README.md @@ -0,0 +1,98 @@ +# Containers Configuration + +## Overview +`containers.yml` defines LXC/Incus containers that run on the infrastructure. Each entry creates a development environment for a team member. + +## Quick Start Workflow + +### 1. Clone the Repository +```bash +git clone https://github.com/tinkerhub/infried.git +cd infried +``` + +### 2. Create a Feature Branch +```bash +git checkout -b "feat/add-member-NAME" +``` +Replace `NAME` with the member's username (e.g., `feat/add-member-jasim`). + +### 3. Update containers.yml +Edit `containers/containers.yml` and add the new container configuration (see section below). + +### 4. Commit and Create PR +```bash +git add containers/containers.yml +git commit -m "feat: add container for member-NAME" +git push origin feat/add-member-NAME +``` +Then create a pull request on GitHub. + +--- + +## How to Add a Container + +Copy this template and update the values: + +```yaml +- name: username + bridge: incusbr-members + cpu: 4 + memory: 4GB + disk: 5GB + ssh_port: 222X + user: username + ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5... full_key" +``` + +## Parameters + +| Parameter | Description | Example | +|-----------|-------------|---------| +| **name** | Container identifier (unique) | `member-sexy-jasim` | +| **bridge** | Network bridge to connect | `incusbr-members` (standard, dont change unless uk what ur doing ) | +| **cpu** | CPU cores allocated | `4` | +| **memory** | RAM allocation | `4GB` | +| **disk** | Storage space | `5GB` | +| **ssh_port** | VPS port for SSH access | `2223` (must be unique) | +| **user** | Linux username inside container | `jasim` | +| **ssh_key** | Public SSH key (ed25519 preferred) | Full key string | + +## Getting SSH Key + +if you dont have a ssh key pair, generate it via, the command below and copy the **public key**: +```bash +ssh-keygen -t ed25519 -C "user@domain.com" +cat ~/.ssh/id_ed25519.pub +``` + +Copy the entire output starting with `ssh-ed25519`. + +## Rules + +- **Port numbers must be unique** — no duplicates +- **Names must be unique** — used as container identifier +- **Bridge should be** `incusbr-members` for member containers +- **Indentation matters** — YAML format is strict (use spaces, not tabs) + +## Example: Adding a New Member + +User provides: +- Name: `jasi` +- SSH key: `ssh-ed25519 AAAAC3NzaC1lZDI1...` +- Preferred port: `2225` + +Add to `containers.yml`: +```yaml +- name: member-jasi + bridge: incusbr-members + cpu: 4 + memory: 4GB + disk: 5GB + ssh_port: 2225 + user: jasi + ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1..." +``` + +Then commit and push your branch to create a pull request. + diff --git a/containers/containers.yml b/containers/containers.yml index f56b054..bd0c142 100644 --- a/containers/containers.yml +++ b/containers/containers.yml @@ -18,12 +18,10 @@ user: nihal2 ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJE+GRo3Is1QsbH4n6hlqiif9gV6Ncaby6E3QPsOLuAd tharaam" - - name: Devadath +- name: member-devadath bridge: incusbr-members cpu: 4 memory: 4GB - disk: 5GB - ssh_port: 2224 - user: Devadath - ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFPnwdhXo6fnWErGyGQSRM7tots8Y6tbEjqsuDjJ5Bpn devadaths3@gmail.com -" + disk: 5GB + ssh_port: 2225 + user: devadath From c0b045e99bbed9565147de9a5dfc9159dc679ec6 Mon Sep 17 00:00:00 2001 From: Rishi-k-s Date: Sun, 12 Apr 2026 18:01:00 +0530 Subject: [PATCH 2/2] feat: add tinkerspace container and revert devadath naming - Add tinkerspace container (rishi, 2228) - Revert Devadath to original naming convention - Allocate 6GB memory and 10GB disk for tinkerspace --- containers/containers.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/containers/containers.yml b/containers/containers.yml index bd0c142..61b0bb3 100644 --- a/containers/containers.yml +++ b/containers/containers.yml @@ -18,10 +18,20 @@ user: nihal2 ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJE+GRo3Is1QsbH4n6hlqiif9gV6Ncaby6E3QPsOLuAd tharaam" -- name: member-devadath +- name: Devadath bridge: incusbr-members cpu: 4 memory: 4GB - disk: 5GB + disk: 5GB ssh_port: 2225 - user: devadath + user: Devadath + ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFPnwdhXo6fnWErGyGQSRM7tots8Y6tbEjqsuDjJ5Bpn devadaths3@gmail.com" + +- name: tinkerspace + bridge: incusbr-members + cpu: 4 + memory: 6GB + disk: 10GB + ssh_port: 2228 + user: rishi + ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFEt8v0Fd9DD0ONfueo+sL/oWHM/60qcO04hUBF2vox7" \ No newline at end of file