From 80babc6068996ccba9a167a3c0a676d3a05e7e4f Mon Sep 17 00:00:00 2001 From: Gabe Rudy Date: Mon, 6 Jan 2025 09:04:06 -0700 Subject: [PATCH 1/2] Declare 'extend' variable in docker.js This 'extend' variable is not being defined which is causing errors in node v20. --- lib/docker.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/docker.js b/lib/docker.js index 9c63399..e652443 100644 --- a/lib/docker.js +++ b/lib/docker.js @@ -13,7 +13,8 @@ var EventEmitter = require('events').EventEmitter, Exec = require('./exec'), util = require('./util'), withSession = require('./session'); - extend = util.extend; + +var extend = util.extend; var Docker = function(opts) { if (!(this instanceof Docker)) return new Docker(opts); @@ -1872,4 +1873,4 @@ Docker.Task = Task; Docker.Node = Node; Docker.Exec = Exec; -module.exports = Docker; \ No newline at end of file +module.exports = Docker; From 0b9533c54463455ebadb2183b6d430157876debd Mon Sep 17 00:00:00 2001 From: Gabe Rudy Date: Thu, 9 Jan 2025 18:51:42 -0700 Subject: [PATCH 2/2] Update docker.js Updated fix to use ',' --- lib/docker.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/docker.js b/lib/docker.js index e652443..502513a 100644 --- a/lib/docker.js +++ b/lib/docker.js @@ -12,9 +12,8 @@ var EventEmitter = require('events').EventEmitter, Node = require('./node'), Exec = require('./exec'), util = require('./util'), - withSession = require('./session'); - -var extend = util.extend; + withSession = require('./session'), + extend = util.extend; var Docker = function(opts) { if (!(this instanceof Docker)) return new Docker(opts);