@ossy/deployment-tools 0.0.76 → 0.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.76",
+  "version": "0.0.77",
   "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

@@ -16,22 +16,29 @@ class DockerService {
 
   static startDefaultContainers(platformConfig) {
     return exec(`docker run -d --name=mongodb --network=${platformConfig.ciDockerNetworkName} --network-alias=mongodb --rm mongo`)
-      .catch(logErrorAndReject('[DockerService] Could not start mongodb container'))
+      .catch(() => {/* if it fails it's probably because the network already exists*/})
   }
 
   static createDockerNetworkForContainerManagerServer(platformConfig) {
     logInfo({ message: '[DockerService] Creating docker network for comunication between containers' })
     return exec(`docker network create ${platformConfig.ciDockerNetworkName}`)
-      .catch(() => {/* if it fils it's probably because the network already exists*/})
+      .catch(() => {/* if it fails it's probably because the network already exists*/ })
   }
 
   static stopContainer(deploymentRequest) {
     const name = deploymentRequest.image.replaceAll('/', '_')
-    logInfo({ message: `[DockerService] Running docker stop for image with the name of ${name}` })
+    logInfo({ message: `[DockerService] Stopping container for ${name}` })
     return exec(`docker stop ${name}`)
       .catch(() => {}) // no worries if container isn't there
   }
 
+  static removeImage(deploymentRequest) {
+    const name = deploymentRequest.image.replaceAll('/', '_')
+    logInfo({ message: `[DockerService] Removing image ${name}` })
+    return exec(`docker image rm -f ${name}`)
+      .catch(() => {}) // no worries if container isn't there
+  }
+
   static startContainer(platformConfig, { image, containerPort, hostPort, registry, env }) {
     const name = image.replaceAll('/', '_')
     const imageUrl = !!registry ? `${registry}/${image}` : image
@@ -60,6 +67,7 @@ class DockerService {
 
     return DockerService.resolveCredentials(deploymentRequest)
       .then(() => DockerService.stopContainer(deploymentRequest))
+      .then(() => DockerService.removeImage(deploymentRequest))
       .then(() => DockerService.startContainer(platformConfig, deploymentRequest))
   }
 

package/src/docker/docker-service.playground.js

@@ -1,19 +1,4 @@
 const { DockerService } = require('./docker-service')
 
-// DockerService.deploy(
-//   { ciDockerNetworkName: 'deployment-tools' },
-//   {
-//     type: 'CONTAINER',
-//     dockerFile: './Dockerfile-prod',
-//     dockerContext: './',
-//     targetDeploymentPlatform: 'oskarssylwan',
-//     image: 'mongo',
-//     hostPort: '3005',
-//     containerPort: '3000',
-//     subdomain: 'cms',
-//     env: {},
-//     registry: 'ghcr.io'
-//   }
-// )
 
-DockerService.createDockerNetworkForContainerManagerServer({ ciDockerNetworkName: 'foo' })
+DockerService.removeImage({ ciDockerNetworkName: 'foo', image: 'mongo' })

package/src/infrastructure/dns-stack.js

@@ -52,7 +52,8 @@ class DnsStack extends Stack {
           new ARecord(this, domain, {
             zone,
             recordName: domain,
-            target: RecordTarget.fromIpAddresses(props.containerDeploymentTargetPublicIp)
+            target: RecordTarget.fromIpAddresses(props.containerDeploymentTargetPublicIp),
+            ttl: Duration.seconds(60)
           })
         })