andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-11-13 15:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3229 from fir4tozden/fix/some-fixes-in-dockerSafeExec

Browse Source 
fix: some fixes in dockerSafeExec()
This commit is contained in:
Mauricio Siu
2025-12-19 23:10:59 -06:00
committed by GitHub
parent 1b22384315 5d42737943
commit b476e50ff1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/utils/docker/utils.ts
+6 -5
View File
@@ -146,17 +146,17 @@ export const getContainerByName = (name: string): Promise<ContainerInfo> => {
}; };
/** /**
* Docker commands passed through this method are held during Docker's build or pull process. * Docker commands sent using this method are held in a hold when Docker is busy.
* *
* https://github.com/Dokploy/dokploy/pull/3064 * https://github.com/Dokploy/dokploy/pull/3064
* https://github.com/fir4tozden
*/ */
export const dockerSafeExec = (exec: string) => `CHECK_INTERVAL=10 export const dockerSafeExec = (exec: string) => `
CHECK_INTERVAL=10
echo "Preparing for execution..." echo "Preparing for execution..."
while true; do while true; do
PROCESSES=$(ps aux | grep -E "docker build|docker pull" | grep -v grep) PROCESSES=$(ps aux | grep -E "^.*docker [A-Za-z]" | grep -v grep)
if [ -z "$PROCESSES" ]; then if [ -z "$PROCESSES" ]; then
echo "Docker is idle. Starting execution..." echo "Docker is idle. Starting execution..."
@@ -169,7 +169,8 @@ done
${exec} ${exec}
echo "Execution completed."`; echo "Execution completed."
`;
const cleanupCommands = { const cleanupCommands = {
containers: "docker container prune --force", containers: "docker container prune --force",