lixiangwuxian/qq_bot
0
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 添加对 nil 容器的检查，确保在执行容器操作前容器已创建

Browse Source
This commit is contained in:
lixiangwuxian 2025-04-12 21:11:56 +08:00
parent a374db2560
commit b49b780da2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/exec/exec.go
View File

@ -80,6 +80,9 @@ func NewDockerContainer(memory int64, cpu int64) (*dockerContainer, error) {
// CreateAndStartContainer creates a container, sets resource limits, and starts it // CreateAndStartContainer creates a container, sets resource limits, and starts it
// The container runs `tail -f /dev/null` to keep running, waiting for new commands // The container runs `tail -f /dev/null` to keep running, waiting for new commands
func (dc *dockerContainer) CreateAndStartContainer() error { func (dc *dockerContainer) CreateAndStartContainer() error {
if dc == nil {
return fmt.Errorf("no container found, please create and start the container first")
}
// 如果容器已经存在，则跳过创建 // 如果容器已经存在，则跳过创建
if dc.ContainerID != "" { if dc.ContainerID != "" {
fmt.Println("Container already exists, skipping creation.") fmt.Println("Container already exists, skipping creation.")
@ -131,7 +134,7 @@ func (dc *dockerContainer) CreateAndStartContainer() error {
// ExecCommandInContainer executes a command in the existing container and returns its output // ExecCommandInContainer executes a command in the existing container and returns its output
func (dc *dockerContainer) ExecCommandInContainer(command string) (string, error) { func (dc *dockerContainer) ExecCommandInContainer(command string) (string, error) {
if dc.ContainerID == "" { if dc == nil {
return "", fmt.Errorf("no container found, please create and start the container first") return "", fmt.Errorf("no container found, please create and start the container first")
} }
@ -173,6 +176,9 @@ func (dc *dockerContainer) ExecCommandInContainer(command string) (string, error
// RestartAndCleanContainer stops, removes, and recreates the container // RestartAndCleanContainer stops, removes, and recreates the container
func (dc *dockerContainer) RestartAndCleanContainer() error { func (dc *dockerContainer) RestartAndCleanContainer() error {
if dc == nil {
return nil
}
if dc.ContainerID == "" { if dc.ContainerID == "" {
return fmt.Errorf("no container to restart") return fmt.Errorf("no container to restart")
} }
@ -218,6 +224,9 @@ func (dc *dockerContainer) RestartAndCleanContainer() error {
// RemoveContainer stops and removes the container // RemoveContainer stops and removes the container
func (dc *dockerContainer) RemoveContainer() error { func (dc *dockerContainer) RemoveContainer() error {
if dc == nil {
return nil
}
if dc.ContainerID == "" { if dc.ContainerID == "" {
return fmt.Errorf("no container to remove") return fmt.Errorf("no container to remove")
} }