Skip to content

Commit 7f60241

Browse files
committed
Pass compose env vars to docker down to suppress undefined variable warnings
1 parent c71df2c commit 7f60241

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

setup/main.mjs

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,22 @@ const buildcageVersion = resolveVersion(buildcageImage);
4545

4646
console.log(`buildcage image: ${buildcageImage}:${buildcageVersion}`);
4747

48+
const composeEnv = {
49+
...process.env,
50+
PROXY_MODE: process.env.INPUT_PROXY_MODE || "restrict",
51+
ALLOWED_HTTP_DOMAINS: process.env.INPUT_ALLOWED_HTTP_DOMAINS || "",
52+
ALLOWED_HTTPS_DOMAINS: process.env.INPUT_ALLOWED_HTTPS_DOMAINS || "",
53+
HTTP_PORTS: process.env.INPUT_HTTP_PORTS || "80",
54+
HTTPS_PORTS: process.env.INPUT_HTTPS_PORTS || "443",
55+
BUILDCAGE_IMAGE: buildcageImage,
56+
BUILDCAGE_VERSION: buildcageVersion,
57+
PORT: process.env.INPUT_PORT || "1234",
58+
};
59+
4860
execFileSync(
4961
"docker",
5062
["compose", "-f", composeFile, "down"],
51-
{ stdio: "inherit" }
63+
{ stdio: "inherit", env: composeEnv }
5264
);
5365

5466
execFileSync(
@@ -58,20 +70,7 @@ execFileSync(
5870
"-f", composeFile,
5971
"up", "-d", "--pull", "always", "--no-build", "--wait",
6072
],
61-
{
62-
stdio: "inherit",
63-
env: {
64-
...process.env,
65-
PROXY_MODE: process.env.INPUT_PROXY_MODE || "restrict",
66-
ALLOWED_HTTP_DOMAINS: process.env.INPUT_ALLOWED_HTTP_DOMAINS || "",
67-
ALLOWED_HTTPS_DOMAINS: process.env.INPUT_ALLOWED_HTTPS_DOMAINS || "",
68-
HTTP_PORTS: process.env.INPUT_HTTP_PORTS || "80",
69-
HTTPS_PORTS: process.env.INPUT_HTTPS_PORTS || "443",
70-
BUILDCAGE_IMAGE: buildcageImage,
71-
BUILDCAGE_VERSION: buildcageVersion,
72-
PORT: process.env.INPUT_PORT || "1234",
73-
},
74-
}
73+
{ stdio: "inherit", env: composeEnv }
7574
);
7675

7776
// Set action output

0 commit comments

Comments
 (0)