Skip to content

fix: Add existence check when restarting Docker #10926

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

Merged
f2c-ci-robot merged 1 commit into from
Nov 12, 2025
Merged

fix: Add existence check when restarting Docker #10926

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
10 changes: 9 additions & 1 deletion frontend/src/views/host/firewall/status/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ import DockerRestart from '@/components/docker-proxy/docker-restart.vue';
import { MsgSuccess } from '@/utils/message';
import { ElMessageBox } from 'element-plus';
import { ref } from 'vue';
import { loadDockerStatus } from '@/api/modules/container';

const props = defineProps({
currentTab: String,
Expand All @@ -107,10 +108,12 @@ const onPing = ref('Disable');
const oldStatus = ref();
const dockerRef = ref();
const operation = ref('restart');
const dockerStatus = ref();
const withDockerRestart = ref(false);

const acceptParams = (): void => {
loadBaseInfo(true);
loadDocker();
};
const emit = defineEmits(['search', 'update:is-active', 'update:loading', 'update:maskShow', 'update:name']);

Expand Down Expand Up @@ -140,6 +143,11 @@ const loadBaseInfo = async (search: boolean) => {
});
};

const loadDocker = async () => {
const res = await loadDockerStatus();
dockerStatus.value = res.data.isExist;
};

const loadInitMsg = () => {
switch (props.currentTab) {
case 'base':
Expand Down Expand Up @@ -201,7 +209,7 @@ const onUnBind = async () => {

const onOperate = async (op: string) => {
operation.value = op;
if (baseInfo.value.name === 'iptables') {
if (baseInfo.value.name === 'iptables' || !dockerStatus.value) {
emit('update:loading', true);
emit('update:maskShow', true);
await operateFire(operation.value, false)
Expand Down
10 changes: 9 additions & 1 deletion frontend/src/views/setting/panel/proxy/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ import { GlobalStore } from '@/store';
import { storeToRefs } from 'pinia';
import ConfirmDialog from '@/components/confirm-dialog/index.vue';
import DockerProxyDialog from '@/components/docker-proxy/dialog.vue';
import { loadDockerStatus } from '@/api/modules/container';

const globalStore = GlobalStore();
const emit = defineEmits<{ (e: 'search'): void }>();
Expand Down Expand Up @@ -105,6 +106,7 @@ const form = reactive({
proxyPasswdKeepItem: false,
proxyDocker: false,
});
const dockerStatus = ref();
const withDockerRestart = ref(false);
const dockerProxyRef = ref();

Expand Down Expand Up @@ -135,6 +137,12 @@ const acceptParams = (params: DialogProps): void => {
proxyDockerVisible.value = params.proxyDocker !== '';
proxyVisible.value = true;
form.proxyPasswdKeepItem = params.passwdKeep === 'Enable';
loadDocker();
};

const loadDocker = async () => {
const res = await loadDockerStatus();
dockerStatus.value = res.data.isExist;
};

const submitChangePassword = async (formEl: FormInstance | undefined) => {
Expand All @@ -158,7 +166,7 @@ const submitChangePassword = async (formEl: FormInstance | undefined) => {
if (form.proxyType === 'http' || form.proxyType === 'https') {
params.proxyUrl = form.proxyUrl;
}
if (isMasterProductPro.value && (params.proxyDocker || proxyDockerVisible.value)) {
if (dockerStatus.value && isMasterProductPro.value && (params.proxyDocker || proxyDockerVisible.value)) {
dockerProxyRef.value.acceptParams({
syncList: 'SyncSystemProxy',
open: true,
Expand Down
Loading