refactor: logic in docker environment

warp-tech · Oct 27, 2023 · 127d277 · 127d277
1 parent 8b91e4a
commit 127d277
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -34,7 +34,5 @@ COPY --from=build /opt/warpgate/target/release/warpgate /usr/local/bin/warpgate
 
 VOLUME /data
 
-ENV DOCKER 1
-
 ENTRYPOINT ["warpgate", "--config", "/data/warpgate.yaml"]
 CMD ["run"]
diff --git a/warpgate/src/commands/common.rs b/warpgate/src/commands/common.rs
@@ -1,4 +1,5 @@
 use tracing::*;
+use std::path::Path;
 
 pub(crate) fn assert_interactive_terminal() {
     if !atty::is(atty::Stream::Stdin) {
@@ -11,5 +12,5 @@ pub(crate) fn assert_interactive_terminal() {
 }
 
 pub(crate) fn is_docker() -> bool {
-    std::env::var("DOCKER").is_ok()
-}
+    Path::new("/.dockerenv").exists()
+}