From f9f8ec78110fdaa39f491f93c6c1617a81478223 Mon Sep 17 00:00:00 2001
From: Vincent Weevers <mail@vincentweevers.nl>
Date: Sat, 31 Jul 2021 23:33:05 +0200
Subject: [PATCH 1/2] Fix forwarding of version option to docker-remote-api

Which only takes a single argument, rather than two.
---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index b970bce..98ca69d 100644
--- a/index.js
+++ b/index.js
@@ -12,7 +12,7 @@ var pull = function (image, opts, cb) {
   image = parse(image)
   if (!image) throw new Error('Invalid image')
 
-  var request = docker(opts.host, {version: opts.version || 'v1.15'})
+  var request = docker({host: opts.host, version: opts.version || 'v1.15'})
   var that = new events.EventEmitter()
   var layers = {}
   var progress = {}

From b7b315cd350dd078150cab5f3f4e29a0b6dbdde0 Mon Sep 17 00:00:00 2001
From: Vincent Weevers <mail@vincentweevers.nl>
Date: Sat, 31 Jul 2021 23:37:12 +0200
Subject: [PATCH 2/2] Fix pulling from a custom registry

Bumps the default Engine API version from 1.15 to 1.21.
---
 index.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/index.js b/index.js
index 98ca69d..67b3e73 100644
--- a/index.js
+++ b/index.js
@@ -12,7 +12,7 @@ var pull = function (image, opts, cb) {
   image = parse(image)
   if (!image) throw new Error('Invalid image')
 
-  var request = docker({host: opts.host, version: opts.version || 'v1.15'})
+  var request = docker({host: opts.host, version: opts.version || 'v1.21'})
   var that = new events.EventEmitter()
   var layers = {}
   var progress = {}
@@ -42,11 +42,20 @@ var pull = function (image, opts, cb) {
     cb()
   }
 
+  var fromImage = image.repository
+
+  if (image.namespace) {
+    fromImage = image.namespace + '/' + fromImage
+  }
+
+  if (image.registry) {
+    fromImage = image.registry + '/' + fromImage
+  }
+
   var post = request.post('/images/create', {
     qs: {
-      fromImage: (image.namespace ? image.namespace + '/' : '') + image.repository,
-      tag: image.tag || 'latest',
-      registry: image.registry || ''
+      fromImage: fromImage,
+      tag: image.tag || 'latest'
     },
     headers: {
       'X-Registry-Auth': {