@ossy/deployment-tools 0.0.55 → 0.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.55",
+  "version": "0.0.56",
   "description": "Collection of scripts and tools to aid deployment of containers and static files to Amazon Web Services through GitHub Actions",
   "source": "./src/index.js",
   "main": "./src/index.js",

package/src/docker/docker-service.js

@@ -1,5 +1,5 @@
 const { exec: execBash } = require('child_process')
-const { logInfo, logDebug } = require('../log')
+const { logInfo, logDebug, logErrorAndReject } = require('../log')
 
 const exec = command => new Promise((resolve, reject) => {
   execBash(command, (error, stdout, stderr) => {
@@ -32,6 +32,7 @@ class DockerService {
     const envsAsString = Object.entries(env || {}).reduce((envs, [name, value]) => `${envs} --env ${name}=${value}`, '')
     logInfo({ message: `[DockerService] Running docker start for image with the name of ${name} with port mapping ${hostPort}:${containerPort} and source ${imageUrl}` })
     return exec(`docker run -d -p ${hostPort}:${containerPort} --name=${name} --network=${platformConfig.ciDockerNetworkName} --network-alias=${name} --rm ${envsAsString} ${imageUrl}`)
+      .cath(logErrorAndReject(`[DockerService] Could not start container ${image}`))
   }
 
   static resolveCredentials({ registry, username, authentication }) {
@@ -41,9 +42,10 @@ class DockerService {
       ? logInfo({ message: '[DockerService] Docker credentials provided, logging in to private repository' })
       : logInfo({ message: '[DockerService] No docker credentials provided, assuming image is publicly hosted' })
 
-    return shouldAuthenticate
-      ? exec(`docker login ${registry} -u ${username} -p ${authentication}`)
-      : Promise.resolve()
+    return !shouldAuthenticate
+      ? Promise.resolve()
+      : exec(`docker login ${registry} -u ${username} -p ${authentication}`)
+        .cath(logErrorAndReject(`[DockerService] Could not authenticate with ${registry}`))
   }
 
   static deploy(platformConfig, deploymentRequest) {

package/src/log.js

@@ -33,8 +33,14 @@ const logDebug = logInput => {
   logInput.data && log('\n[Debug data]:', logInput.data, '\n')
 }
 
+const logErrorAndReject = message => error => {
+  logError({ message, error })
+  return Promise.reject(error)
+}
+
 module.exports = {
   logInfo,
   logError,
+  logErrorAndReject,
   logDebug
 }

package/src/server/platform-server.js

@@ -24,7 +24,7 @@ class PlatformServerService {
         platformConfig,
         deploymentRequest => {
           DockerService.deploy(platformConfig, deploymentRequest)
-          CaddyService.addDeployment(platformConfig, deploymentRequest)
+            .then(() => CaddyService.addDeployment(platformConfig, deploymentRequest))
           return Promise.resolve()
         }
       )