Docker test.

Author: popovaan

.github/workflows/precommit.yml

@@ -26,3 +26,12 @@ jobs:
         with:
           name: wheel
           path: ${{ github.workspace }}/**/*.whl
+
+  Run_Docker_Tests:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: git ls-tree
+        run: |
+          docker build --tag 'image_tests' .

Dockerfile

@@ -0,0 +1,14 @@
+FROM python:3.12
+WORKDIR /usr/local/app
+ENV CI=true
+ENV DOCKER_RUN=true
+
+RUN pip install pytest
+
+COPY src ./src
+EXPOSE 5000
+
+RUN useradd app
+USER app
+
+RUN pytest -k test_is_docker ./

src/backend/backend_ga4.py

@@ -21,18 +21,10 @@ def _send_func(request_data):
     except Exception as err:
         pass  # nosec
 
-
 def is_docker():
-    def text_in_file(text, filename):
-        try:
-            with open(filename, encoding='utf-8') as lines:
-                return any(text in line for line in lines)
-        except OSError:
-            return False
-
-    cgroup = os.path.join('proc', 'self', 'cgroup')
-    return os.path.exists(os.sep + '.dockerenv') or text_in_file('docker', cgroup)
-
+    from pathlib import Path
+    cgroup = Path('/proc/self/cgroup')
+    return Path('/.dockerenv').is_file() or cgroup.is_file() and 'docker' in cgroup.read_text()
 
 class GA4Backend(TelemetryBackend):
     id = 'ga4'

src/backend/backend_ga4_test.py

@@ -101,3 +101,11 @@ def test_new_cid_priority_over_old_file(self):
                                                     self.backend.old_cid_filename)
 
                 self.assertTrue(cid_value == new_cid)
+
+    def test_is_docker(self):
+        from .backend_ga4 import is_docker
+        run_from_docker = "DOCKER_RUN" in os.environ and os.environ["DOCKER_RUN"].lower() == "true"
+        print("os.environ {}".format(os.environ["DOCKER_RUN"]))
+        print("is docker {}".format(is_docker()))
+
+        self.assertTrue(run_from_docker == is_docker())