Skip to content

Custom docker socket (Issue #386 ) #396

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
Klubas wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Custom docker socket (Issue #386 ) #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b180983
add possibility to use env var DOCKER_SOCKET to set docker socket path
Klubas Nov 3, 2022
490c109
Update frontend to allow custom docker socket on host
Klubas Nov 8, 2022
7d873e0
Update controllers/apps/docker/useDocker.js and utils/init/initialCon…
Klubas Nov 8, 2022
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
1,110 changes: 816 additions & 294 deletions client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 14 additions & 1 deletion client/src/components/Settings/DockerSettings/DockerSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const DockerSettings = (): JSX.Element => {
return (
<form onSubmit={(e) => formSubmitHandler(e)}>
<SettingsHeadline text="Docker" />
{/* CUSTOM DOCKER SOCKET HOST */}
{/* CUSTOM DOCKER REMOTE HOST */}
<InputGroup>
<label htmlFor="dockerHost">Docker host</label>
<input
Expand Down Expand Up @@ -100,6 +100,19 @@ export const DockerSettings = (): JSX.Element => {
</select>
</InputGroup>

{/* CUSTOM DOCKER SOCKET */}
<InputGroup>
<label htmlFor="dockerSocket">Docker socket</label>
<input
type="text"
id="dockerSocket"
name="dockerSocket"
placeholder="/path/to/socket.sock"
value={formData.dockerSocket}
onChange={(e) => inputChangeHandler(e)}
/>
</InputGroup>

{/* KUBERNETES SETTINGS */}
<SettingsHeadline text="Kubernetes" />
{/* USE KUBERNETES */}
Expand Down
1 change: 1 addition & 0 deletions client/src/interfaces/Config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export interface Config {
secondarySearchProvider: string;
dockerApps: boolean;
dockerHost: string;
dockerSocket: string;
kubernetesApps: boolean;
unpinStoppedApps: boolean;
useAmericanDate: boolean;
Expand Down
1 change: 1 addition & 0 deletions client/src/interfaces/Forms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export interface UISettingsForm {
export interface DockerSettingsForm {
dockerApps: boolean;
dockerHost: string;
dockerSocket: string;
kubernetesApps: boolean;
unpinStoppedApps: boolean;
}
Expand Down
1 change: 1 addition & 0 deletions client/src/utility/templateObjects/configTemplate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export const configTemplate: Config = {
secondarySearchProvider: 'd',
dockerApps: false,
dockerHost: 'localhost',
dockerSocket: '/var/run/docker.sock',
kubernetesApps: false,
unpinStoppedApps: false,
useAmericanDate: false,
Expand Down
1 change: 1 addition & 0 deletions client/src/utility/templateObjects/settingsTemplate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export const generalSettingsTemplate: GeneralForm = {
export const dockerSettingsTemplate: DockerSettingsForm = {
dockerApps: true,
dockerHost: 'localhost',
dockerSocket: '/var/run/docker.sock',
kubernetesApps: true,
unpinStoppedApps: true,
};
Expand Down
3 changes: 2 additions & 1 deletion controllers/apps/docker/useDocker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const useDocker = async (apps) => {
useOrdering: orderType,
unpinStoppedApps,
dockerHost: host,
dockerSocket: socket
} = await loadConfig();

let containers = null;
Expand All @@ -20,7 +21,7 @@ const useDocker = async (apps) => {
let { data } = await axios.get(
`http://${host}/containers/json?{"status":["running"]}`,
{
socketPath: '/var/run/docker.sock',
socketPath: socket,
}
);

Expand Down
1 change: 1 addition & 0 deletions utils/init/initialConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"secondarySearchProvider": "d",
"dockerApps": false,
"dockerHost": "localhost",
"dockerSocket": "/var/run/docker.sock",
"kubernetesApps": false,
"unpinStoppedApps": false,
"useAmericanDate": false,
Expand Down