@ossy/deployment-tools 0.0.81 → 0.0.82

package/cdk.context.json

@@ -72,5 +72,9 @@
   "hosted-zone:account=858451553223:domainName=oskarssylwan.se:region=eu-north-1": {
     "Id": "/hostedzone/Z06541531WYSO7D1IVDTT",
     "Name": "oskarssylwan.se."
+  },
+  "hosted-zone:account=858451553223:domainName=oskarssylwan.com:region=eu-north-1": {
+    "Id": "/hostedzone/Z07488011P8FXGWA11LTS",
+    "Name": "oskarssylwan.com."
   }
 }

package/package.json

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

@@ -41,7 +41,7 @@ class DockerService {
 
   static startContainer(platformConfig, { image, containerPort, hostPort, registry, env, domain }) {
     const imageUrl = !!registry ? `${registry}/${image}` : image
-    const envsAsString = Object.entries(env || {}).reduce((envs, [name, value]) => `${envs} --env ${name}=${value}`, '')
+    const envsAsString = Object.entries(env || {}).reduce((envs, [name, value]) => `${envs} --env ${name}="${value}"`, '')
     logInfo({ message: `[DockerService] Starting container for ${domain} with port mapping ${hostPort}:${containerPort} and source ${imageUrl}` })
     return exec(`docker run -d -p ${hostPort}:${containerPort} --name=${domain} --network=${platformConfig.ciDockerNetworkName} --network-alias=${domain} --rm ${envsAsString} ${imageUrl}`)
       .catch(logErrorAndReject(`[DockerService] Could not start container ${image}`))

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

@@ -1,6 +1,19 @@
 const { DockerService } = require('./docker-service')
 
+const platformConfig = {
+  ciDockerNetworkName: 'foo'
+}
 
-DockerService.removeImage(
-  { image: 'ossy-se/cms-client-web', registry: 'ghcr.io', domain: 'oskars.com', hostPort: '3005', containerPort: '3000' }
+const deploymentTemplate =   {
+    "domain": "api.qa.ossy.se",
+    "image": "ossy-se/cms-api",
+    "targetDeploymentPlatform": "ossybot",
+    "type": "CONTAINER",
+    "hostPort": "3001",
+    "containerPort": "3000",
+  }
+
+DockerService.startContainer(
+  platformConfig,
+  deploymentTemplate
 )

package/src/infrastructure/container-deployment-target/container-deployment-target.js

@@ -10,7 +10,9 @@ const {
   SecurityGroup,
   Peer,
   Port,
-  UserData
+  UserData,
+  BlockDevice,
+  BlockDeviceVolume
 } = require('aws-cdk-lib/aws-ec2')
 const { Role, ServicePrincipal, Policy, PolicyStatement, Effect } = require('aws-cdk-lib/aws-iam')
 const { Queue } = require('aws-cdk-lib/aws-sqs')
@@ -73,7 +75,7 @@ class ContainerDeploymentTarget extends Construct {
     })
 
     const platformConfigDeployment = new BucketDeployment(this, 'PlatformConfigDeployment', {
-      sources: [Source.jsonData('platform-config.json', props.config)],
+      sources: [Source.jsonData('platform-config.json', { ...props.config, awsRoleToAssume: undefined })],
       destinationBucket: props.bucket
     })
 
@@ -143,11 +145,17 @@ class ContainerDeploymentTarget extends Construct {
       role,
       instanceType: InstanceType.of(
         InstanceClass.T3,
-        InstanceSize.MICRO
+        InstanceSize.LARGE
       ),
       machineImage: new GenericLinuxImage({
         [SupportedRegions.North]: InstanceImages.UBUNTU
       }),
+      blockDevices: [
+        {
+          deviceName: '/dev/sda1',
+          volume: BlockDeviceVolume.ebs(50)
+        }
+      ],
       keyName: props.config.awsKeyPairName
     })