Skip to content

Commit af5fe73

Browse files
authored
Merge branch 'feat/develop' into master
2 parents 81b89ff + 8ad3b64 commit af5fe73

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

api/api/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"version": "v1",
55
"status": "active",
6-
"release_date": "2025-09-11T20:17:18.854289411+05:30",
6+
"release_date": "2025-09-18T09:02:53.080017+05:30",
77
"end_of_life": "0001-01-01T00:00:00Z",
88
"changes": [
99
"Initial API version"

api/internal/features/deploy/tasks/create.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
"github.com/google/uuid"
99
"github.com/raghavyuva/caddygo"
10+
"github.com/raghavyuva/nixopus-api/internal/config"
1011
"github.com/raghavyuva/nixopus-api/internal/features/deploy/types"
1112
shared_types "github.com/raghavyuva/nixopus-api/internal/types"
1213
)
@@ -81,7 +82,9 @@ func (t *TaskService) HandleCreateDockerfileDeployment(ctx context.Context, Task
8182
taskCtx.LogAndUpdateStatus("Failed to convert port to int: "+err.Error(), shared_types.Failed)
8283
return err
8384
}
84-
err = client.AddDomainWithAutoTLS(TaskPayload.Application.Domain, TaskPayload.Application.Domain, port, caddygo.DomainOptions{})
85+
upstreamHost := config.AppConfig.SSH.Host
86+
87+
err = client.AddDomainWithAutoTLS(TaskPayload.Application.Domain, upstreamHost, port, caddygo.DomainOptions{})
8588
if err != nil {
8689
fmt.Println("Failed to add domain: ", err)
8790
taskCtx.LogAndUpdateStatus("Failed to add domain: "+err.Error(), shared_types.Failed)

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262

6363
nixopus-redis:
6464
image: redis:7-alpine
65-
container_name: nixopus-redis-container
65+
container_name: nixopus-redis
6666
restart: unless-stopped
6767
ports:
6868
- "${REDIS_PORT:-6379}:6379"

helpers/config.dev.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ services:
1717
SSH_PASSWORD: ${SSH_PASSWORD:-}
1818
DOCKER_HOST: ${DOCKER_HOST:-unix:///var/run/docker.sock}
1919
REDIS_URL: ${REDIS_URL:-redis://localhost:6379}
20+
CADDY_ENDPOINT: ${CADDY_ENDPOINT:-http://127.0.0.1:2019}
2021
ALLOWED_ORIGIN: ${ALLOWED_ORIGIN:-http://localhost:7443}
2122
ENV: ${ENV:-development}
2223
LOGS_PATH: ${LOGS_PATH:-./logs}

view/components/ui/password-input-field.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ export interface PasswordInputFieldProps extends React.ComponentProps<'input'> {
99
}
1010

1111
const PasswordInputField = React.forwardRef<HTMLInputElement, PasswordInputFieldProps>(
12-
function PasswordInputField({ className, containerClassName, ...props }, ref) {
12+
function PasswordInputField({ className, containerClassName, autoComplete, ...props }, ref) {
1313
const [showPassword, setShowPassword] = React.useState(false);
1414

1515
return (
1616
<div className={cn('relative', containerClassName)}>
1717
<Input
1818
ref={ref}
19+
{...props}
1920
type={showPassword ? 'text' : 'password'}
2021
className={cn('pr-10', className)}
21-
autoComplete={props.autoComplete ?? 'current-password'}
22-
{...props}
22+
autoComplete={autoComplete ?? 'current-password'}
2323
/>
2424
<button
2525
type="button"

0 commit comments

Comments
 (0)