@ossy/deployment-tools 0.0.3 → 0.0.6

package/README.md

@@ -1,10 +1,10 @@
 # deployment-tools
 
-Collection of scripts and tools to aid deployment of containers and static files
+Command line toolkit to aid deployment of containers and static files
 
 ## Getting started
 
-Make sure Docker and Caddy is up and running
+Make sure NodeJs and npm is installed and Docker and Caddy is up and running
 ```
 npx @ossy-se/deployment-tools start
 npx @ossy-se/deployment-tools deploy --ossyfile ./ossy.js

package/dist/index.js

@@ -28476,12 +28476,12 @@ class CaddyClient {
     this.serverName = serverName
   }
 
-  deploy({ domain, targetPort }) {
+  deploy({ domain, environmentName, targetPort }) {
     return fetch(`http://localhost:2019/config/apps/http/servers/${this.serverName}/routes`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
-        match: [Matchers.host(domain)],
+        match: [Matchers.host(`*.${environmentName}.${domain}`)],
         handle: [
           Handlers.subroute([{ handle: [Handlers.reverseProxy(targetPort)] }])
         ],
@@ -28834,7 +28834,11 @@ class ContainerManagerCommands {
 
           console.log('body', body)
 
-          fetch(`http://${targetEnvironment}.ci.${platform.domain}/deploy`, {
+          const ciUrl = targetEnvironment === 'prod'
+            ? `http://${platform.ciSubDomain}.${platform.domain}/deploy`
+            : `http://${platform.ciSubDomain}.${targetEnvironment}.${platform.domain}/deploy`
+
+          fetch(ciUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(body)
@@ -28854,6 +28858,7 @@ class ContainerManagerCommands {
 
 
 
+
 const [_, __, command, ...restArgs] = process.argv
 
 const startHandler = () => {
@@ -28874,9 +28879,10 @@ Description=D
 After=network.target
 
 [Service]
-Environment=DEPLOYMENT_TOOLS_PORT=3000
+Environment=DEPLOYMENT_TOOLS_DOMAIN=${domain}
+Environment=DEPLOYMENT_TOOLS_SUBDOMAIN=${subdomain}
+Environment=DEPLOYMENT_TOOLS_PORT=${port}
 User=root
-WorkingDirectory=/%h/deployment-tools
 ExecStart=npx @ossy/deployment-tools start-container-manager
 Restart=on-failure
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/deployment-tools",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "description": "Collection of scripts and tools to aid deployment of containers and static files",
   "main": "dist/index.js",
   "type": "module",

package/src/caddy-client.js

@@ -80,12 +80,12 @@ class CaddyClient {
     this.serverName = serverName
   }
 
-  deploy({ domain, targetPort }) {
+  deploy({ domain, environmentName, targetPort }) {
     return fetch(`http://localhost:2019/config/apps/http/servers/${this.serverName}/routes`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
-        match: [Matchers.host(domain)],
+        match: [Matchers.host(`*.${environmentName}.${domain}`)],
         handle: [
           Handlers.subroute([{ handle: [Handlers.reverseProxy(targetPort)] }])
         ],

package/src/container-manager-commands.js

@@ -101,7 +101,11 @@ export class ContainerManagerCommands {
 
           console.log('body', body)
 
-          fetch(`http://${targetEnvironment}.ci.${platform.domain}/deploy`, {
+          const ciUrl = targetEnvironment === 'prod'
+            ? `http://${platform.ciSubDomain}.${platform.domain}/deploy`
+            : `http://${platform.ciSubDomain}.${targetEnvironment}.${platform.domain}/deploy`
+
+          fetch(ciUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(body)

package/src/index.js

@@ -5,6 +5,7 @@ import { exec } from 'child_process'
 import arg from 'arg'
 import { ContainerManagerServer } from './container-manager-server.js'
 import { ContainerManagerCommands } from './container-manager-commands.js'
+import * as config from './config.js'
 
 const [_, __, command, ...restArgs] = process.argv
 
@@ -26,9 +27,10 @@ Description=D
 After=network.target
 
 [Service]
-Environment=DEPLOYMENT_TOOLS_PORT=3000
+Environment=DEPLOYMENT_TOOLS_DOMAIN=${config.domain}
+Environment=DEPLOYMENT_TOOLS_SUBDOMAIN=${config.subdomain}
+Environment=DEPLOYMENT_TOOLS_PORT=${config.port}
 User=root
-WorkingDirectory=/%h/deployment-tools
 ExecStart=npx @ossy/deployment-tools start-container-manager
 Restart=on-failure