Compare commits

...

3 commits

Author SHA1 Message Date
Louis Lam 5ed6bd9982 WIP 2023-11-25 17:07:53 +08:00
Louis Lam 875793d6c2 Merge branch 'master' into rollout 2023-11-25 15:39:37 +08:00
Louis Lam e9c8abf759 Add Docker Rollout 2023-11-25 00:27:16 +08:00
6 changed files with 60 additions and 14 deletions

View file

@ -189,6 +189,28 @@ export class DockerSocketHandler extends SocketHandler {
} }
}); });
// rolloutStack
socket.on("rolloutStack", async (stackName : unknown, callback) => {
try {
checkLogin(socket);
if (typeof(stackName) !== "string") {
throw new ValidationError("Stack name must be a string");
}
const stack = Stack.getStack(server, stackName);
await stack.rollout(socket);
callback({
ok: true,
msg: "Rolled out"
});
server.sendStackList();
stack.joinCombinedTerminal(socket);
} catch (e) {
callbackError(e, callback);
}
});
// down stack // down stack
socket.on("downStack", async (stackName : unknown, callback) => { socket.on("downStack", async (stackName : unknown, callback) => {
try { try {

View file

@ -323,6 +323,21 @@ export class Stack {
return exitCode; return exitCode;
} }
async rollout(socket: DockgeSocket) {
let terminalName = getComposeTerminalName(this.name);
let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "pull" ], this.path);
if (exitCode !== 0) {
throw new Error("Failed to pull, please check the terminal output for more information.");
}
terminalName = getComposeTerminalName(this.name);
exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "rollout", this.name ], this.path);
if (exitCode !== 0) {
throw new Error("Failed to rollout, please check the terminal output for more information.");
}
return exitCode;
}
async stop(socket: DockgeSocket) : Promise<number> { async stop(socket: DockgeSocket) : Promise<number> {
const terminalName = getComposeTerminalName(this.name); const terminalName = getComposeTerminalName(this.name);
let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "stop" ], this.path); let exitCode = await Terminal.exec(this.server, socket, terminalName, "docker", [ "compose", "stop" ], this.path);

View file

@ -25,15 +25,8 @@ RUN apt update && apt install --yes --no-install-recommends \
&& npm install pnpm -g \ && npm install pnpm -g \
&& pnpm install -g tsx && pnpm install -g tsx
# ensures that /var/run/docker.sock exists # Install docker rollout plugin \
# changes the ownership of /var/run/docker.sock RUN mkdir -p ~/.docker/cli-plugins \
RUN touch /var/run/docker.sock && chown node:node /var/run/docker.sock && curl https://raw.githubusercontent.com/wowu/docker-rollout/master/docker-rollout -o ~/.docker/cli-plugins/docker-rollout \
&& chmod +x ~/.docker/cli-plugins/docker-rollout \
# Full Base Image && docker rollout --help
# MariaDB, Chromium and fonts
#FROM base-slim AS base
#ENV DOCKGE_ENABLE_EMBEDDED_MARIADB=1
#RUN apt update && \
# apt --yes --no-install-recommends install mariadb-server && \
# rm -rf /var/lib/apt/lists/* && \
# apt --yes autoremove

View file

@ -54,6 +54,7 @@ import {
faTerminal, faWarehouse, faHome, faRocket, faTerminal, faWarehouse, faHome, faRocket,
faRotate, faRotate,
faCloudArrowDown, faArrowsRotate, faCloudArrowDown, faArrowsRotate,
faPaintRoller,
} from "@fortawesome/free-solid-svg-icons"; } from "@fortawesome/free-solid-svg-icons";
library.add( library.add(
@ -109,6 +110,7 @@ library.add(
faRotate, faRotate,
faCloudArrowDown, faCloudArrowDown,
faArrowsRotate, faArrowsRotate,
faPaintRoller,
); );
export { FontAwesomeIcon }; export { FontAwesomeIcon };

View file

@ -20,6 +20,7 @@
"updateStack": "Update", "updateStack": "Update",
"startStack": "Start", "startStack": "Start",
"downStack": "Stop & Down", "downStack": "Stop & Down",
"rolloutStack": "Rollout Update (Zero Downtime)",
"editStack": "Edit", "editStack": "Edit",
"discardStack": "Discard", "discardStack": "Discard",
"saveStackDraft": "Save", "saveStackDraft": "Save",

View file

@ -41,11 +41,15 @@
{{ $t("stopStack") }} {{ $t("stopStack") }}
</button> </button>
<BDropdown v-if="!isEditMode && active" right text="" variant="normal"> <BDropdown v-if="!isEditMode || active" right text="" variant="normal">
<BDropdownItem @click="downStack"> <BDropdownItem v-if="!isEditMode" @click="downStack">
<font-awesome-icon icon="stop" class="me-1" /> <font-awesome-icon icon="stop" class="me-1" />
{{ $t("downStack") }} {{ $t("downStack") }}
</BDropdownItem> </BDropdownItem>
<BDropdownItem v-if="active" @click="rolloutStack">
<font-awesome-icon icon="paint-roller" class="me-1" />
{{ $t("rolloutStack") }} <span class="badge bg-info">Beta</span>
</BDropdownItem>
</BDropdown> </BDropdown>
</div> </div>
@ -486,6 +490,15 @@ export default {
}); });
}, },
rolloutStack() {
this.processing = true;
this.$root.getSocket().emit("rolloutStack", this.stack.name, (res) => {
this.processing = false;
this.$root.toastRes(res);
});
},
downStack() { downStack() {
this.processing = true; this.processing = true;