Fix network subnet collision, zombie processes, and env vars (#19)

* Specifying subnet for docker network
* Use docker compose's default network, so fewer networks need to get created
* Refactoring config to env vars
* Fixing zombie processes

config/docker-compose-common-services.yaml

@@ -11,7 +11,7 @@ services:
     command: ["-config=/sourcegraph/cloud-agent-config.yaml"]
     restart: always
     networks:
-      - sourcegraph
+      - default
 
   src-serve-git:
     # Uses a valid hostname as container_name, to trick the cloud agent and code host config into finding this container on the Docker network
@@ -21,7 +21,11 @@ services:
       - ../src-serve-root/:/sourcegraph/src-serve-root:ro
     command: "serve-git -addr :443 /sourcegraph/src-serve-root"
     networks:
-      - sourcegraph
+      - default
 
 networks:
-  sourcegraph:
+  default:
+    ipam:
+      driver: default
+      config:
+        - subnet: "172.20.2.0/27"

repo-converter/build/Dockerfile

@@ -13,14 +13,16 @@ ENV PYTHONDONTWRITEBYTECODE=1
 # the application crashes without emitting any logs due to buffering
 ENV PYTHONUNBUFFERED=1
 
-# Install python
+# Install packages
 RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install --no-install-recommends -y \
         cron \
+        gcc \
         git \
         git-svn \
         python3 \
+        python3-dev \
         python3-pip \
         python3-wheel \
         subversion \
@@ -31,8 +33,6 @@ RUN apt-get update && \
     systemctl enable cron && \
     systemctl start cron
 
-#        python3-dev \
-#        gcc \
 
 # Download dependencies as a separate step to take advantage of Docker's caching
 # Leverage a cache mount to /root/.cache/pip to speed up subsequent builds

repo-converter/build/docker-compose-override.yaml

@@ -2,5 +2,5 @@ services:
 
   src-serve-git:
     # Uses a valid hostname as container_name, to trick the cloud agent and code host config into finding this container on the Docker network
-    container_name: src-serve-git-wsl.local
-    command: "-v serve-git -addr :443 /sourcegraph/src-serve-root"
+    container_name: src-serve-git-ubuntu.local
+    command: "serve-git -addr :443 /sourcegraph/src-serve-root"

repo-converter/build/docker-compose.yaml

@@ -18,5 +18,7 @@ services:
       - ../../config/toprc:/root/.config/procps/toprc
       - ../../src-serve-root/:/sourcegraph/src-serve-root
     environment:
-      - BRIDGE_REPO_CONVERTER_INTERVAL_SECONDS=60
-      - LOG_LEVEL=DEBUG # DEBUG INFO WARNING ERROR CRITICAL # Default is INFO
+      - REPO_CONVERTER_INTERVAL_SECONDS=60
+      - LOG_LEVEL=DEBUG # DEBUG INFO WARNING ERROR CRITICAL # Default is INFO
+      # - REPOS_TO_CONVERT="/sourcegraph/repos-to-convert.yaml" # Path inside the container to find this file, only change to match if the right side of the volume mapping changes
+      # - SRC_SERVE_ROOT="/sourcegraph/src-serve-root" # Path inside the container to find this directory, only change to match if the right side of the volume mapping changes

repo-converter/build/requirements.txt

@@ -1 +1,2 @@
+psutil
 PyYAML