@codedependant/semantic-release-docker 5.1.0 → 5.1.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Semantic Release Docker
 
+## [5.1.1](https://github.com/esatterwhite/semantic-release-docker/compare/v5.1.0...v5.1.1) (2025-05-24)
+
+
+### Bug Fixes
+
+* **ci**: update actions runner dependencies [1f23b01](https://github.com/esatterwhite/semantic-release-docker/commit/1f23b01b6f8ddec193eada6e9a441bba95c739dc) - Eric Satterwhite
+* **plugin**: better support for multiple plugin instances [8b6621c](https://github.com/esatterwhite/semantic-release-docker/commit/8b6621c60a4ba40d16d5ed026cd49c23396c6e98) - Eric Satterwhite, closes: [#60](https://github.com/esatterwhite/semantic-release-docker/issues/60)
+
+
+### Chores
+
+* **compose**: update docker registry certs [4513f83](https://github.com/esatterwhite/semantic-release-docker/commit/4513f83a3eb9eb0bdab4e05ef132290cfccc0f8e) - Eric Satterwhite
+* **deps**: object-hash@3.0.0 [e04e9d3](https://github.com/esatterwhite/semantic-release-docker/commit/e04e9d373c44c6145ebae3170d2b878dedccafc5) - Eric Satterwhite
+* **deps**: stream-buffers@3.0.3 [b937a46](https://github.com/esatterwhite/semantic-release-docker/commit/b937a4693ab054d3496a6f902024cd70ff7c7543) - Eric Satterwhite
+
 # [5.1.0](https://github.com/esatterwhite/semantic-release-docker/compare/v5.0.4...v5.1.0) (2024-12-30)
 
 

package/index.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const crypto = require('crypto')
 const docker = require('./lib/docker/index.js')
 const dockerPrepare = require('./lib/prepare.js')
 const dockerVerify = require('./lib/verify.js')
@@ -8,9 +7,9 @@ const dockerPublish = require('./lib/publish.js')
 const buildConfig = require('./lib/build-config.js')
 const dockerSuccess = require('./lib/success.js')
 const dockerFail = require('./lib/fail.js')
-const build_id = crypto.randomBytes(10).toString('hex')
 
-let image
+// map multiple images to a unique sha
+const IMAGES = new Map()
 module.exports = {
   buildConfig
 , fail
@@ -22,31 +21,41 @@ module.exports = {
 
 /* istanbul ignore next */
 async function fail(config, context) {
-  const opts = await buildConfig(build_id, config, context)
-  context.image = image || docker.Image.from(opts, context)
+  const opts = await buildConfig(null, config, context)
+  const image = IMAGES.get(opts.build) || docker.Image.from(opts, context)
+  context.image = image
+  IMAGES.set(opts.build, image)
   return dockerFail(opts, context)
 }
 
 async function prepare(config, context) {
-  const opts = await buildConfig(build_id, config, context)
-  image = await dockerPrepare(opts, context)
+  const opts = await buildConfig(null, config, context)
+  const image = await dockerPrepare(opts, context)
+  IMAGES.set(opts.build, image)
   return image
 }
 
 async function publish(config, context) {
-  const opts = await buildConfig(build_id, config, context)
-  context.image = image || docker.Image.from(opts, context)
+  const opts = await buildConfig(null, config, context)
+  const image = IMAGES.get(opts.build) || docker.Image.from(opts, context)
+  context.image = image
+  IMAGES.set(opts.build, image)
   return dockerPublish(opts, context)
 }
 
 async function success(config, context) {
-  const opts = await buildConfig(build_id, config, context)
-  context.image = image || docker.Image.from(opts, context)
+  const opts = await buildConfig(null, config, context)
+  const image = IMAGES.get(opts.build) || docker.Image.from(opts, context)
+  context.image = image
+  IMAGES.set(opts.build, image)
   return dockerSuccess(opts, context)
 }
 
 async function verifyConditions(config, context) {
-  const opts = await buildConfig(build_id, config, context)
-  context.image = image || docker.Image.from(opts, context)
+  const opts = await buildConfig(null, config, context)
+  const image = IMAGES.get(opts.build) || docker.Image.from(opts, context)
+  context.image = image
+  IMAGES.set(opts.build, image)
   return dockerVerify(opts, context)
 }
+

package/lib/build-config.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const hash = require('object-hash')
 const path = require('path')
 const readPkg = require('./read-pkg.js')
 const object = require('./lang/object/index.js')
@@ -7,10 +8,13 @@ const array = require('./lang/array/index.js')
 const parsePkgName = require('./parse-pkg-name.js')
 const typeCast = require('./lang/string/typecast.js')
 const PWD = '.'
+const PID = `${process.pid}`
+const TIMESTAMP = new Date().toISOString()
 
 module.exports = buildConfig
 
-async function buildConfig(build_id, config, context) {
+function applyDefaults(config) {
+
   const {
     dockerFile: dockerfile = 'Dockerfile'
   , dockerNoCache: nocache = false
@@ -31,9 +35,54 @@ async function buildConfig(build_id, config, context) {
   , dryRun: dry_run = false
   } = config
 
+  return {
+    dockerfile
+  , nocache
+  , tags
+  , args
+  , build_flags
+  , cache_from
+  , registry
+  , login
+  , image
+  , platform
+  , publish
+  , dockerContext
+  , verifycmd
+  , network
+  , clean
+  , quiet
+  , dry_run
+  }
+}
+
+async function buildConfig(build_id, config, context) {
   let name = null
   let scope = null
   let pkg = {}
+
+  const normalized = applyDefaults(config)
+
+  const {
+    dockerfile
+  , nocache
+  , tags
+  , args
+  , build_flags
+  , cache_from
+  , registry
+  , login
+  , image
+  , platform
+  , publish
+  , dockerContext
+  , verifycmd
+  , network
+  , clean
+  , quiet
+  , dry_run
+  } = normalized
+
   try {
     pkg = await readPkg({cwd: context.cwd})
     const parsed = parsePkgName(pkg.name)
@@ -48,7 +97,7 @@ async function buildConfig(build_id, config, context) {
 
   if (cache_from) build_flags.cache_from = array.toArray(cache_from)
 
-  return {
+  const configuration = {
     registry
   , dockerfile
   , nocache
@@ -71,7 +120,7 @@ async function buildConfig(build_id, config, context) {
     , ...(args || {})
     }
   , name: image || name
-  , build: build_id
+  , build: null
   , login: login
   , env: context.env
   , context: dockerContext
@@ -80,4 +129,11 @@ async function buildConfig(build_id, config, context) {
   , clean: typeCast(clean) === true
   , platform: array.toArray(platform)
   }
+
+  configuration.build = build_id || genBuildId(normalized)
+  return configuration
+}
+
+function genBuildId(configuration) {
+  return hash([configuration, PID, TIMESTAMP], {algorithm: 'sha256'})
 }

package/lib/publish.js

@@ -12,12 +12,12 @@ async function publish(opts, context) {
   const sha256 = image.sha256 || opts.build_id
 
   actions.setOutput('docker_image', image.repo)
-  actions.setOutput('docker_image_build_id', opts.build_id)
+  actions.setOutput('docker_image_build_id', image.opts.build_id)
   actions.setOutput('docker_image_sha_short', sha)
   actions.setOutput('docker_image_sha_long', sha256)
 
   actions.exportVariable('SEMANTIC_RELEASE_DOCKER_IMAGE', image.repo)
-  actions.exportVariable('SEMANTIC_RELEASE_DOCKER_IMAGE_BUILD_ID', opts.build_id)
+  actions.exportVariable('SEMANTIC_RELEASE_DOCKER_IMAGE_BUILD_ID', image.opts.build_id)
   actions.exportVariable('SEMANTIC_RELEASE_DOCKER_IMAGE_SHA_SHORT', sha)
   actions.exportVariable('SEMANTIC_RELEASE_DOCKER_IMAGE_SHA_LONG', sha256)
   await image.push()

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codedependant/semantic-release-docker",
   "private": false,
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "docker package",
   "main": "index.js",
   "files": [
@@ -74,6 +74,7 @@
     "eslint-config-codedependant": "^3.0.0",
     "semantic-release": "17",
     "sinon": "^9.0.2",
+    "stream-buffers": "^3.0.3",
     "tap": "^16.0.0"
   },
   "dependencies": {
@@ -82,6 +83,7 @@
     "debug": "^4.1.1",
     "execa": "^4.0.2",
     "handlebars": "^4.7.7",
+    "object-hash": "^3.0.0",
     "semver": "^7.3.2"
   }
 }