docker-storage-gc 3.5.6 → 3.5.7

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Import bluebird as `Bluebird` instead of `Promise`
+      hash: f97bfe4be10415ff3a74709d1c158eb847a280d1
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+  version: 3.5.7
+  title: ""
+  date: 2023-11-28T22:06:48.856Z
 - commits:
     - subject: Remove unused `mz` dependency
       hash: b39c411f82f69b7aa980364bce04e8b398a343da
@@ -8,7 +19,7 @@
       author: Pagan Gazzard
   version: 3.5.6
   title: ""
-  date: 2023-11-28T20:43:10.957Z
+  date: 2023-11-28T20:47:13.918Z
 - commits:
     - subject: add support for arm32 architecture
       hash: d308f7ad8e13c0d34960328c58e18715acb70aaf

package/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v3.5.7
+## (2023-11-28)
+
+* Import bluebird as `Bluebird` instead of `Promise` [Pagan Gazzard]
+
 # v3.5.6
 ## (2023-11-28)
 

package/build/docker-event-stream.js

@@ -1,9 +1,9 @@
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var CONTAINER_EVENTS, IMAGE_EVENTS, JSONStream, Promise, es, parseEventStream,
+  var Bluebird, CONTAINER_EVENTS, IMAGE_EVENTS, JSONStream, es, parseEventStream,
     indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
-  Promise = require('bluebird');
+  Bluebird = require('bluebird');
 
   es = require('event-stream');
 
@@ -43,7 +43,7 @@
   };
 
   exports.dockerMtimeStream = function(docker) {
-    return Promise.join(docker.getEvents(), parseEventStream(docker), function(stream, streamParser) {
+    return Bluebird.join(docker.getEvents(), parseEventStream(docker), function(stream, streamParser) {
       return es.pipeline(stream, streamParser);
     });
   };

package/build/docker-image-tree.js

@@ -1,11 +1,11 @@
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Promise, _, createNode, createTree, getMtime, getMtimeFrom, saneRepoAttrs,
+  var Bluebird, _, createNode, createTree, getMtime, getMtimeFrom, saneRepoAttrs,
     indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   _ = require('lodash');
 
-  Promise = require('bluebird');
+  Bluebird = require('bluebird');
 
   saneRepoAttrs = function(repoAttrs) {
     if (repoAttrs == null) {
@@ -73,7 +73,7 @@
   };
 
   exports.dockerImageTree = function(docker, layer_mtimes) {
-    return Promise.join(docker.listImages({
+    return Bluebird.join(docker.listImages({
       all: true
     }), docker.listContainers({
       all: true

package/build/docker.js

@@ -1,20 +1,20 @@
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Docker, Promise, _, getDockerConnectOpts;
+  var Bluebird, Docker, _, getDockerConnectOpts;
 
   Docker = require('dockerode');
 
-  Promise = require('bluebird');
+  Bluebird = require('bluebird');
 
   _ = require('lodash');
 
   getDockerConnectOpts = function(hostObj) {
     if (!_.isEmpty(hostObj)) {
-      return Promise.resolve(hostObj);
+      return Bluebird.resolve(hostObj);
     }
-    return Promise.resolve({
+    return Bluebird.resolve({
       socketPath: '/var/run/docker.sock',
-      Promise: Promise
+      Promise: Bluebird
     });
   };
 

package/build/index.js

@@ -1,9 +1,9 @@
 // Generated by CoffeeScript 1.12.7
 (function() {
-  var Docker, DockerGC, DockerProgress, EventEmitter, Promise, _, dockerImageTree, dockerMtimeStream, dockerUtils, getImagesToRemove, getUnusedTreeLeafs, recordGcRunTime, streamToString,
+  var Bluebird, Docker, DockerGC, DockerProgress, EventEmitter, _, dockerImageTree, dockerMtimeStream, dockerUtils, getImagesToRemove, getUnusedTreeLeafs, recordGcRunTime, streamToString,
     bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
 
-  Promise = require('bluebird');
+  Bluebird = require('bluebird');
 
   _ = require('lodash');
 
@@ -60,7 +60,7 @@
   };
 
   streamToString = function(stream) {
-    return new Promise(function(resolve, reject) {
+    return new Bluebird(function(resolve, reject) {
       var chunks;
       chunks = [];
       return stream.on('error', reject).on('data', function(chunk) {
@@ -94,7 +94,7 @@
     DockerGC.prototype.setDocker = function(hostObj) {
       this.currentMtimes = {};
       this.hostObj = _.defaults({
-        Promise: Promise
+        Promise: Bluebird
       }, hostObj);
       this.dockerProgress = new DockerProgress({
         docker: new Docker(this.hostObj)
@@ -134,7 +134,7 @@
 
     DockerGC.prototype.tryRemoveImageBy = function(image, attributes, removalType) {
       if ((attributes != null) && attributes.length > 0) {
-        return Promise.each(attributes, (function(_this) {
+        return Bluebird.each(attributes, (function(_this) {
           return function(attribute) {
             console.log("[GC (" + _this.host + "] Removing image : " + attribute + " (id: " + image.id + ")");
             return _this.docker.getImage(attribute).remove({
@@ -184,7 +184,7 @@
     };
 
     DockerGC.prototype.getOutput = function(image, command) {
-      return Promise.using(this.runDisposer(image, command), function(container) {
+      return Bluebird.using(this.runDisposer(image, command), function(container) {
         return container.logs({
           stdout: true,
           follow: true

package/lib/docker-event-stream.coffee

@@ -1,4 +1,4 @@
-Promise = require 'bluebird'
+Bluebird = require 'bluebird'
 es = require 'event-stream'
 JSONStream = require 'JSONStream'
 
@@ -35,7 +35,7 @@ exports.parseEventStream = parseEventStream = (docker) ->
 	)
 
 exports.dockerMtimeStream = (docker) ->
-	Promise.join(
+	Bluebird.join(
 		docker.getEvents()
 		parseEventStream(docker)
 		(stream, streamParser) ->

package/lib/docker-image-tree.coffee

@@ -1,5 +1,5 @@
 _ = require 'lodash'
-Promise = require 'bluebird'
+Bluebird = require 'bluebird'
 
 saneRepoAttrs = (repoAttrs) ->
 	return [] if !repoAttrs?
@@ -48,7 +48,7 @@ exports.createTree = createTree = (images, containers, layer_mtimes) ->
 	return tree[root]
 
 exports.dockerImageTree = (docker, layer_mtimes) ->
-	Promise.join(
+	Bluebird.join(
 		docker.listImages(all: true)
 		docker.listContainers(all: true)
 		layer_mtimes

package/lib/docker.coffee

@@ -1,11 +1,11 @@
 Docker = require 'dockerode'
-Promise = require 'bluebird'
+Bluebird = require 'bluebird'
 _ = require 'lodash'
 
 getDockerConnectOpts = (hostObj) ->
 	if !_.isEmpty(hostObj)
-		return Promise.resolve(hostObj)
-	return Promise.resolve({ socketPath: '/var/run/docker.sock', Promise })
+		return Bluebird.resolve(hostObj)
+	return Bluebird.resolve({ socketPath: '/var/run/docker.sock', Promise: Bluebird })
 
 exports.getDocker = (hostObj) ->
 	getDockerConnectOpts(hostObj)

package/lib/index.coffee

@@ -1,4 +1,4 @@
-Promise = require 'bluebird'
+Bluebird = require 'bluebird'
 _ = require 'lodash'
 { EventEmitter } = require 'eventemitter3'
 
@@ -47,7 +47,7 @@ getImagesToRemove = (tree, reclaimSpace, metrics) ->
 	return result
 
 streamToString = (stream) ->
-	new Promise (resolve, reject) ->
+	new Bluebird (resolve, reject) ->
 		chunks = []
 		stream
 		.on('error', reject)
@@ -72,7 +72,7 @@ class DockerGC
 
 	setDocker: (hostObj) ->
 		@currentMtimes = {}
-		@hostObj = _.defaults({ Promise }, hostObj)
+		@hostObj = _.defaults({ Promise: Bluebird }, hostObj)
 		@dockerProgress = new DockerProgress({ docker: new Docker(@hostObj) })
 		dockerUtils.getDocker(@hostObj)
 		.then (@docker) =>
@@ -101,7 +101,7 @@ class DockerGC
 
 	tryRemoveImageBy: (image, attributes, removalType) =>
 		if attributes? and attributes.length > 0
-			Promise.each attributes, (attribute) =>
+			Bluebird.each attributes, (attribute) =>
 				console.log("[GC (#{@host}] Removing image : #{attribute} (id: #{image.id})")
 				@docker.getImage(attribute).remove(noprune: true)
 				.then =>
@@ -131,7 +131,7 @@ class DockerGC
 				throw err
 
 	getOutput: (image, command) ->
-		Promise.using @runDisposer(image, command), (container) ->
+		Bluebird.using @runDisposer(image, command), (container) ->
 			container.logs(stdout: true, follow: true)
 			.then (logs) ->
 				streamToString(logs)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docker-storage-gc",
-  "version": "3.5.6",
+  "version": "3.5.7",
   "main": "build/index.js",
   "types": "index.d.ts",
   "scripts": {
@@ -32,6 +32,6 @@
     "timekeeper": "0.0.5"
   },
   "versionist": {
-    "publishedAt": "2023-11-28T20:43:11.069Z"
+    "publishedAt": "2023-11-28T22:06:48.959Z"
   }
 }

package/test/docker-event-stream.coffee

@@ -1,4 +1,3 @@
-Promise = require 'bluebird'
 { expect } = require 'chai'
 fs = require 'fs'
 es = require 'event-stream'

package/test/docker-image-tree.coffee

@@ -1,4 +1,3 @@
-Promise = require 'bluebird'
 { expect } = require 'chai'
 fs = require 'fs'
 tk = require 'timekeeper'

package/test/index.coffee

@@ -1,4 +1,4 @@
-Promise = require 'bluebird'
+Bluebird = require 'bluebird'
 { expect } = require 'chai'
 
 DockerGC = require('../lib/index')
@@ -31,14 +31,14 @@ describe 'Garbage collection', ->
 	beforeEach ->
 		@dockerStorage = new DockerGC()
 		# Use either local or CI docker
-		Promise.join(
+		Bluebird.join(
 			dockerUtils.getDocker({
 				socketPath: '/tmp/dind/docker.sock',
-				Promise,
+				Promise: Bluebird,
 			})
 			@dockerStorage.setDocker({
 				socketPath: '/tmp/dind/docker.sock',
-				Promise,
+				Promise: Bluebird,
 			})
 			(docker) =>
 				@dockerStorage.setupMtimeStream()
@@ -87,14 +87,14 @@ describe 'Garbage collection', ->
 		docker = @docker
 		dockerStorage = @dockerStorage
 
-		Promise.each NONE_TAG_IMAGES, (image) ->
+		Bluebird.each NONE_TAG_IMAGES, (image) ->
 			pullAsync(docker, image)
 		.then ->
 			docker.getImage(NONE_TAG_IMAGES[0]).inspect()
 		.then ->
 			dockerStorage.garbageCollect(1)
 		.then ->
-			Promise.map NONE_TAG_IMAGES, (image) ->
+			Bluebird.map NONE_TAG_IMAGES, (image) ->
 				promiseToBool(docker.getImage(image).inspect())
 		.then (imagesFound) ->
 			expect(imagesFound).to.deep.equal([false, false])
@@ -129,14 +129,14 @@ describe 'Garbage collection', ->
 		.then ->
 			docker.getImage(IMAGES[0]).tag(repo: 'some-repo', tag: 'some-tag')
 		.then ->
-			Promise.each IMAGES.slice(1), (image) ->
+			Bluebird.each IMAGES.slice(1), (image) ->
 				pullAsync(docker, image)
 		.then =>
 			# Attempt to remove a single byte, which will remove the LRU image,
 			# which should be alpine
 			@dockerStorage.garbageCollect(1)
 		.then ->
-			Promise.map IMAGES, (image) ->
+			Bluebird.map IMAGES, (image) ->
 				promiseToBool(docker.getImage(image).inspect())
 		.then (imagesFound) ->
 			expect(imagesFound).to.deep.equal([false, true, true])
@@ -147,7 +147,7 @@ describe 'Garbage collection', ->
 
 		docker = @docker
 
-		Promise.each IMAGES, (image) ->
+		Bluebird.each IMAGES, (image) ->
 			pullAsync(docker, image)
 		.then ->
 			# Get the size of the first image, so we can add one to it to remove
@@ -156,7 +156,7 @@ describe 'Garbage collection', ->
 		.then (size) =>
 			@dockerStorage.garbageCollect(size + 1)
 		.then ->
-			Promise.map IMAGES, (image) ->
+			Bluebird.map IMAGES, (image) ->
 				promiseToBool(docker.getImage(image).inspect())
 		.then (imagesFound) ->
 			expect(imagesFound).to.deep.equal([false, false, true])