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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ View Video: https://youtu.be/AWAlOQeNpgU?t=48
- PR #687: Support for nested stacks directory (by: https://github.com/mkoo21)
- PR #700: Add Resource Usage Stats (by https://github.com/justwiebe)
- PR #714: Conditional stack files deletion (by: https://github.com/husa)
- PR #687: Support for nested stacks directory (by: https://github.com/mkoo21)


## 🔧 How to Install
Expand Down
6 changes: 3 additions & 3 deletions backend/agent-socket-handlers/docker-socket-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
stack.joinCombinedTerminal(socket); // Ensure the combined terminal is joined
callbackResult({
ok: true,
msg: "Service" + serviceName + " started"
msg: "Service " + serviceName + " started"
}, callback);
server.sendStackList();
} catch (e) {
Expand All @@ -338,7 +338,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
await stack.stopService(socket, serviceName);
callbackResult({
ok: true,
msg: "Service" + serviceName + " stopped"
msg: "Service " + serviceName + " stopped"
}, callback);
server.sendStackList();
} catch (e) {
Expand All @@ -358,7 +358,7 @@ export class DockerSocketHandler extends AgentSocketHandler {
await stack.restartService(socket, serviceName);
callbackResult({
ok: true,
msg: "Service" + serviceName + " restarted"
msg: "Service " + serviceName + " restarted"
}, callback);
} catch (e) {
callbackError(e, callback);
Expand Down
6 changes: 6 additions & 0 deletions backend/stack.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,12 @@ export class Stack {
throw new ValidationError("Stack name already exists");
}

// If this is a new stack that has no compose file yet, use the stack name as directory
if (dir === "") {
this._configFilePath = path.join(this.server.stacksDir, this.name);
dir = this.path;
}

// Create the stack folder
await fsAsync.mkdir(dir);
} else {
Expand Down
11 changes: 7 additions & 4 deletions frontend/src/components/Container.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div v-if="!isEditMode">
<span class="badge me-1" :class="bgStyle">{{ status }}</span>

<a v-for="port in (ports ?? envsubstService.ports)" :key="port" :href="parsePort(port).url" target="_blank">
<a v-for="port in envsubstService.ports" :key="port" :href="parsePort(port).url" target="_blank">
<span class="badge me-1 bg-secondary">{{ parsePort(port).display }}</span>
</a>
</div>
Expand Down Expand Up @@ -213,12 +213,15 @@ export default defineComponent({
type: Object,
default: null,
},
ports: {
type: Array,
default: null
processing: {
type: Boolean,
default: false,
}
},
emits: [
"start-service",
"stop-service",
"restart-service"
],
data() {
return {
Expand Down
11 changes: 7 additions & 4 deletions frontend/src/pages/Compose.vue
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,12 @@
:name="name"
:is-edit-mode="isEditMode"
:first="name === Object.keys(jsonConfig.services)[0]"
:serviceStatus="serviceStatusList[name]?.state"
:ports="serviceStatusList[name]?.ports"
:dockerStats="dockerStats"
:serviceStatus="serviceStatusList[name]"
:dockerStats="dockerStats"
:processing="processing"
@start-service="startService"
@stop-service="stopService"
@restart-service="restartService"
/>
</div>
</div>
Expand Down Expand Up @@ -951,6 +954,7 @@ export default {
}
});
},

async copyWebhookToClipboard() {
try {
await navigator.clipboard.writeText(this.stack.webhook);
Expand All @@ -963,7 +967,6 @@ export default {
selectText(event) {
event.target.select();
},

}
};
</script>
Expand Down