Update for isdocker

step-security · Oct 18, 2024 · 40401cf · 40401cf
1 parent 806ab1c
commit 40401cf
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 20 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/post/index.js b/dist/post/index.js
diff --git a/dist/post/index.js.map b/dist/post/index.js.map
diff --git a/src/cleanup.ts b/src/cleanup.ts
@@ -3,15 +3,15 @@ import * as cp from "child_process";
 import * as common from "./common";
 import isDocker from "is-docker";
 import { isArcRunner } from "./arc-runner";
-
+import { isGithubHosted } from "./tls-inspect";
 (async () => {
   console.log("[harden-runner] post-step");
 
   if (process.platform !== "linux") {
     console.log(common.UBUNTU_MESSAGE);
     return;
   }
-  if (isDocker()) {
+  if (isGithubHosted() && isDocker()) {
     console.log(common.CONTAINER_MESSAGE);
     return;
   }

diff --git a/src/index.ts b/src/index.ts
@@ -2,15 +2,15 @@ import * as common from "./common";
 import * as core from "@actions/core";
 import isDocker from "is-docker";
 import { STEPSECURITY_WEB_URL } from "./configs";
-
+import { isGithubHosted } from "./tls-inspect";
 (async () => {
   console.log("[harden-runner] main-step");
 
   if (process.platform !== "linux") {
     console.log(common.UBUNTU_MESSAGE);
     return;
   }
-  if (isDocker()) {
+  if (isGithubHosted() && isDocker()) {
     console.log(common.CONTAINER_MESSAGE);
     return;
   }