From 739d19da1993ac5195e426141c496588d67fd136 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Fri, 22 Mar 2024 12:53:14 +0000 Subject: [PATCH 1/2] Fix loading private CA certs in Instances It was checking the path to the file existed inside the forge container, but the value is the file on the host to mount --- docker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker.js b/docker.js index c5dc2e6..2054115 100644 --- a/docker.js +++ b/docker.js @@ -90,7 +90,7 @@ const createContainer = async (project, domain) => { contOptions.Env.push('FORGE_LOG_PASSTHROUGH=true') } - if (this._app.config.driver.options?.privateCA && fs.existsSync(this._app.config.driver.options?.privateCA)) { + if (this._app.config.driver.options?.privateCA) { contOptions.Binds = [ `${this._app.config.driver.options.privateCA}:/usr/local/ssl-certs/chain.pem` ] From 434e083f5d3e8628e8637870ed9de8e1dfdbe052 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Fri, 22 Mar 2024 12:56:35 +0000 Subject: [PATCH 2/2] Remove unused import --- docker.js | 1 - 1 file changed, 1 deletion(-) diff --git a/docker.js b/docker.js index 2054115..854ce28 100644 --- a/docker.js +++ b/docker.js @@ -1,4 +1,3 @@ -const fs = require('fs') const got = require('got') const Docker = require('dockerode')