Skip to content

feat: add manual service input fallback for compose domain configuration #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rluo-23 wants to merge 1 commit into
base: canary
Choose a base branch
from
Open

feat: add manual service input fallback for compose domain configuration #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions apps/dokploy/components/dashboard/application/domains/handle-domain.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
<FormItem className="w-full">
<FormLabel>Service Name</FormLabel>
<div className="flex gap-2">
{services && services.length >0 ? (
<Select
onValueChange={field.onChange}
defaultValue={field.value || ""}
Expand All @@ -313,11 +314,16 @@ export const AddDomain = ({ id, type, domainId = "", children }: Props) => {
{service}
</SelectItem>
))}
<SelectItem value="none" disabled>
Empty
</SelectItem>
</SelectContent>
</Select>
</SelectContent>
</Select>
) : (
<FormControl>
<Input
{...field}
placeholder="Enter service name manually"
/>
</FormControl>
)}
<TooltipProvider delayDuration={0}>
<Tooltip>
<TooltipTrigger asChild>
Expand Down
9 changes: 8 additions & 1 deletion packages/server/src/utils/docker/domain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ export const cloneComposeRemote = async (compose: Compose) => {
}
};

const parseComposePath = (composePath:string):string => {
if (composePath.startsWith("-f ")) {
return composePath.substring(3).trim();
}
return composePath;
}

export const getComposePath = (compose: Compose) => {
const { COMPOSE_PATH } = paths(!!compose.serverId);
const { appName, sourceType, composePath } = compose;
Expand All @@ -79,7 +86,7 @@ export const getComposePath = (compose: Compose) => {
if (sourceType === "raw") {
path = "docker-compose.yml";
} else {
path = composePath;
path = parseComposePath(composePath);
}

return join(COMPOSE_PATH, appName, "code", path);
Expand Down