From ce671fc66a121265f5e692970924c15ac1075e35 Mon Sep 17 00:00:00 2001
From: Eric Fritz <eric@eric-fritz.com>
Date: Fri, 10 Jun 2022 15:11:19 -0500
Subject: [PATCH] Squash commits.

---
 docker-compose/docker-compose.override.yaml | 33 +++++++++++++++++++++
 docker-compose/docker-compose.yaml          |  8 ++---
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose/docker-compose.override.yaml

diff --git a/docker-compose/docker-compose.override.yaml b/docker-compose/docker-compose.override.yaml
new file mode 100644
index 000000000..8a8bbf054
--- /dev/null
+++ b/docker-compose/docker-compose.override.yaml
@@ -0,0 +1,33 @@
+version: '2.4'
+services:
+  executor:
+    container_name: executor
+    image: 'index.docker.io/sourcegraph/executor:insiders@sha256:2cfa8f547eadbff999f523055889ffa2ff308bdf11408c777f98c035ebc16878'
+    cpus: 1
+    mem_limit: '4g'
+    # Run as root (required for docker daemon control)
+    user: root
+    # Run with privileged capabilities (required for docker daemon control)
+    privileged: true
+    environment:
+      # Note: Must match `executors.frontendURL` in site config
+      - EXECUTOR_FRONTEND_URL=http://sourcegraph-frontend-0:3080
+      # Note: Must match `executors.accessToken` in site config
+      - EXECUTOR_FRONTEND_PASSWORD=hunter2hunter2hunter2
+      # Choose what work to process
+      - EXECUTOR_QUEUE_NAME=codeintel
+      # Note: Must match left-hand side of scratch volume mount
+      - EXECUTOR_DOCKER_HOST_MOUNT_PATH=/tmp/sourcegraph/executor-scratch
+      # Note: Must match right-hand side of scratch volume mount
+      - TMPDIR=/scratch
+      # Run as root (required for docker daemon control)
+      - UID=1000
+      - GID=1000
+    volumes:
+      # Mount docker socket
+      - '/var/run/docker.sock:/var/run/docker.sock'
+      # Mount volume for workspaces shared by executor and launched containers
+      - '/tmp/sourcegraph/executor-scratch:/scratch'
+    networks:
+      - sourcegraph
+    restart: always
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index cb6a4a6b5..3a939bf9f 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -235,8 +235,8 @@ services:
   zoekt-indexserver-0:
     container_name: zoekt-indexserver-0
     image: 'index.docker.io/sourcegraph/search-indexer:insiders@sha256:461625546e3636a1abd38b94b3accea6b8d1ae92924b738cc7b41f5e8f74bb45'
-    cpus: 8
-    mem_limit: '16g'
+    cpus: 2
+    mem_limit: '4g'
     environment:
       - 'HOSTNAME=zoekt-webserver-0:6070'
       - 'SRC_FRONTEND_INTERNAL=http://sourcegraph-frontend-internal:3090'
@@ -256,8 +256,8 @@ services:
   zoekt-webserver-0:
     container_name: zoekt-webserver-0
     image: 'index.docker.io/sourcegraph/indexed-searcher:insiders@sha256:9d7f9a49ba16dae3c2e0ae27972b02421d65c60682ea107633dac6ab286228fb'
-    cpus: 8
-    mem_limit: '50g'
+    cpus: 2
+    mem_limit: '4g'
     environment:
       - 'HOSTNAME=zoekt-webserver-0:6070'
     healthcheck: