@codedependant/semantic-release-docker 3.1.1 → 3.1.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Semantic Release Docker
 
+## [3.1.2](https://github.com/esatterwhite/semantic-release-docker/compare/v3.1.1...v3.1.2) (2021-09-18)
+
+
+### Bug Fixes
+
+* **config**: ensure the docker context is passed image builds [366b8d1](https://github.com/esatterwhite/semantic-release-docker/commit/366b8d1d1f90855a76cfdb78009ec4510ead769e) - Eric Satterwhite, closes: [#13](https://github.com/esatterwhite/semantic-release-docker/issues/13)
+
 ## [3.1.1](https://github.com/esatterwhite/semantic-release-docker/compare/v3.1.0...v3.1.1) (2021-09-18)
 
 

package/lib/build-config.js

@@ -19,6 +19,7 @@ async function buildConfig(build_id, config, context) {
   , dockerLogin: login = true
   , dockerImage: image
   , dockerPublish: publish = true
+  , dockerContext = '.'
   } = config
 
   let name = null
@@ -58,6 +59,6 @@ async function buildConfig(build_id, config, context) {
   , build: build_id
   , login: login
   , env: context.env
-  , context: config.context || '.'
+  , context: dockerContext
   }
 }

package/lib/docker/image.js

@@ -53,7 +53,7 @@ class Image {
   }
 
   get context() {
-    return this.opts.context
+    return path.resolve(this.opts.cwd, this.opts.context)
   }
 
   set context(ctx) {

package/lib/prepare.js

@@ -16,6 +16,7 @@ async function dockerPrepare(opts, context) {
   , dockerfile: opts.dockerfile
   , build_id: opts.build
   , cwd: cwd
+  , context: opts.context
   })
 
   const args = {

package/lib/publish.js

@@ -15,6 +15,7 @@ async function publish(opts, context) {
   , dockerfile: opts.dockerfile
   , build_id: opts.build
   , cwd: cwd
+  , context: opts.context
   })
 
   const vars = buildTemplateVars(opts, context)

package/lib/verify.js

@@ -17,7 +17,8 @@ async function verify(opts, context) {
     const error = new SemanticError(
       'Docker image name not found'
     , 'EINVAL'
-    , 'Image name parsed from package.json name if possible. Or via the "image" option.'
+    , 'Image name parsed from package.json name if possible. '
+        + 'Or via the "dockerImage" option.'
     )
     throw error
   }
@@ -29,6 +30,7 @@ async function verify(opts, context) {
   , dockerfile: opts.dockerfile
   , build_id: opts.build
   , cwd: cwd
+  , context: opts.context
   })
 
   debug('docker options', opts)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codedependant/semantic-release-docker",
   "private": false,
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "docker package",
   "main": "index.js",
   "scripts": {

package/test/integration/prepare.js

@@ -49,6 +49,7 @@ test('steps::prepare', async (t) => {
       , BUILD_DATE: '{now}'
       }
     , dockerFile: 'docker/Dockerfile.prepare'
+    , dockerContext: 'docker'
     }, context)
 
     const auth = await verify(config, context)
@@ -64,6 +65,7 @@ test('steps::prepare', async (t) => {
     tt.equal(image.opts.args.get('MAJOR_TEMPLATE'), '2', 'MAJOR_TEMPLATE value')
     tt.equal(image.opts.args.get('GIT_REF'), 'abacadaba', 'GIT_REF value')
     tt.match(image.opts.args.get('BUILD_DATE'), DATE_REGEX, 'BUILD_DATE value')
+    tt.equal(image.context, path.join(context.cwd, config.context), 'docker context path')
 
     const {stdout} = await execa('docker', [
       'images', image.name

package/test/integration/verify.js

@@ -172,7 +172,8 @@ test('steps::verify', async (t) => {
       code: 'EINVAL'
     , name: 'SemanticReleaseError'
     , details: new RegExp(
-        'image name parsed from package.json name if possible. or via the "image" option'
+        'image name parsed from package.json name if possible. '
+          + 'or via the "dockerImage" option'
       , 'gi'
       )
     })

package/test/unit/docker/image.js

@@ -60,7 +60,7 @@ test('Image', async (t) => {
     , args: Map
     }, 'default image options')
 
-    tt.equal(img.context, '.', 'default image context')
+    tt.equal(img.context, path.join(__dirname, 'build', '.'), 'default image context')
     img.context = __dirname
     tt.equal(img.context, __dirname, 'context override')
     tt.equal(
@@ -176,7 +176,7 @@ test('Image', async (t) => {
       , 'quay.io/esatterwhite/test:abacadaba'
       , '-f'
       , path.join(process.cwd(), 'Dockerfile')
-      , '.'
+      , process.cwd()
       ], 'build command')
     }
 
@@ -286,4 +286,18 @@ test('Image', async (t) => {
     tt.deepEqual(stdout, '', 'all tags removed')
   })
 
+  t.test('image.context', async (tt) => {
+    const img = new docker.Image({
+      name: 'test'
+    , registry: 'quay.io'
+    , project: 'esatterwhite'
+    , build_id: build_id
+    , cwd: __dirname
+    , dockerfile: path.join('fixture', 'Dockerfile.test')
+    , context: 'fixture'
+    })
+
+    tt.equal(img.context, path.join(__dirname, 'fixture'), 'expected image context')
+  })
+
 }).catch(threw)