From c173792caa4cc535d775fc044b8aede94286d2e6 Mon Sep 17 00:00:00 2001 From: daniwe4 Date: Thu, 16 Nov 2023 14:35:32 +0100 Subject: [PATCH] master delete: 407 fix error while deleting running container --- app/src/App.php | 2 +- app/src/Lib/Docker/DockerShell.php | 1 + setup/updates/update-20231116.sh | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 setup/updates/update-20231116.sh diff --git a/app/src/App.php b/app/src/App.php index 32744a19..f65fbfd1 100644 --- a/app/src/App.php +++ b/app/src/App.php @@ -9,7 +9,7 @@ class App extends Application { - const NAME = "Doil Version 20231115 - build 2023-11-15"; + const NAME = "Doil Version 20231116 - build 2023-11-16"; public function __construct(Command ...$commands) { diff --git a/app/src/Lib/Docker/DockerShell.php b/app/src/Lib/Docker/DockerShell.php index 8d98c699..ceb6f45d 100644 --- a/app/src/Lib/Docker/DockerShell.php +++ b/app/src/Lib/Docker/DockerShell.php @@ -434,6 +434,7 @@ public function removeContainer(string $name) : void $cmd = [ "docker", "rm", + "-f", $name ]; diff --git a/setup/updates/update-20231116.sh b/setup/updates/update-20231116.sh new file mode 100644 index 00000000..45efd911 --- /dev/null +++ b/setup/updates/update-20231116.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +source ${SCRIPT_DIR}/updates/update.sh + +doil_update_20231116() { + cp ${SCRIPT_DIR}/../app/src/App.php /usr/local/lib/doil/app/src/ + cp ${SCRIPT_DIR}/../app/src/Lib/Docker/DockerShell.php /usr/local/lib/doil/app/src/Lib/Docker/ + return $? +} \ No newline at end of file