Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ tmp/
*.sqlite3
*.sqlite3-shm
*.sqlite3-wal

#dev generated
app/web/public/assets/index.js
app/web/public/assets/styles.css
47 changes: 8 additions & 39 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,70 +83,39 @@ We actively welcome your pull requests:
- Node.js (latest stable version)
- Docker (for local testing)
- Kubernetes cluster (for integration testing)
- PostgreSQL (for local development)

### Setup Steps

1. **Clone the repository:**
- **Clone the repository:**

```bash
git clone https://github.com/cloudness-io/cloudness.git
cd cloudness
```

1. **Install dependencies:**
- **Install dependencies:**

```bash
make dep
make tools
```

1. **Build the project:**
- **Run the development server:**

```bash
make build
make dev
```

1. **Set up PostgreSQL:**
- **Access the UI:**

```bash
docker run --name cloudness-pg \
-e POSTGRES_PASSWORD=postgrespwd \
-e POSTGRES_USER=cloudnessusr \
-p 5432:5432 \
-d postgres:latest
```

1. **Configure environment:**

Create a `.env` file in the project root:

```bash
CLOUDNESS_DATABASE_DRIVER=postgres
CLOUDNESS_DATABASE_HOST=localhost
CLOUDNESS_DATABASE_PORT=5432
CLOUDNESS_DATABASE_NAME=cloudness
CLOUDNESS_DATABASE_USER=cloudnessusr
CLOUDNESS_DATABASE_PASSWORD=postgrespwd
CLOUDNESS_DEBUG=true
```

1. **Run the application:**

```bash
./cloudness server .env
```

1. **Access the UI:**

Open your browser at `http://localhost:8000`
Open your browser at `http://localhost:7331`

## Coding Standards

### Go Code

- Follow [Effective Go](https://golang.org/doc/effective_go.html) guidelines
- Use `gofmt` to format your code
- Use `make format` to format your code
- Run `go vet` to catch common mistakes
- Use meaningful variable and function names
- Add comments for exported functions and complex logic
Expand All @@ -171,7 +140,7 @@ func ProcessDeployment(ctx context.Context, spec *DeploymentSpec) error {
### Frontend Code

- Follow [Templ](https://templ.guide/) best practices for Go templates
- Use `templ fmt` to format template files
- Use `make format` to format template files
- Write semantic HTML in templ components
- Use Tailwind CSS utility classes consistently
- Keep components small and reusable
Expand Down
2 changes: 2 additions & 0 deletions app/controller/instance/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ type InstanceUpdateInput struct {
DNSValidationEnabled bool `json:"dns_validation_enabled,string"`
DNSServers string `json:"dns_servers"`
ExternalScripts string `json:"external_scripts"`
AdditionalScripts string `json:"additional_scripts"`
}

type InstanceRegistryUpdateInput struct {
Expand Down Expand Up @@ -103,6 +104,7 @@ func (c *Controller) Update(ctx context.Context, server *types.Server, in *Insta
instance.DNSValidationEnabled = in.DNSValidationEnabled
instance.DNSServers = in.DNSServers
instance.ExternalScripts = in.ExternalScripts
instance.AdditionalScripts = in.AdditionalScripts

err = c.tx.WithTx(ctx, func(ctx context.Context) error {
manager, err := c.factory.GetServerManager(server)
Expand Down
4 changes: 4 additions & 0 deletions app/store/database/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ const instanceColumns = `
,instance_registry_mirror_enabled
,instance_registry_mirror_size
,instance_external_scripts
,instance_additional_scripts
,instance_created
,instance_updated`

Expand All @@ -71,6 +72,7 @@ INSERT INTO instances (
,instance_registry_mirror_enabled
,instance_registry_mirror_size
,instance_external_scripts
,instance_additional_scripts
,instance_created
,instance_updated
) VALUES (
Expand All @@ -90,6 +92,7 @@ INSERT INTO instances (
,:instance_registry_mirror_enabled
,:instance_registry_mirror_size
,:instance_external_scripts
,:instance_additional_scripts
,:instance_created
,:instance_updated
) RETURNING instance_id
Expand Down Expand Up @@ -155,6 +158,7 @@ func (s *InstanceStore) Update(ctx context.Context, instance *types.Instance) (*
,instance_registry_mirror_enabled = :instance_registry_mirror_enabled
,instance_registry_mirror_size = :instance_registry_mirror_size
,instance_external_scripts = :instance_external_scripts
,instance_additional_scripts = :instance_additional_scripts
,instance_created = :instance_created
,instance_updated = :instance_updated
WHERE instance_id = 1`
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE instances ADD COLUMN instance_additional_scripts TEXT;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE instances ADD COLUMN instance_additional_scripts TEXT;
2 changes: 0 additions & 2 deletions app/web/public/assets/index.js

This file was deleted.

Loading
Loading