From 9b328be730939b4d8ebb098ea884db2dbc76b555 Mon Sep 17 00:00:00 2001
From: Myron Marston <myron@squareup.com>
Date: Sun, 23 Feb 2025 18:39:00 -0800
Subject: [PATCH] Further improve our docker image.

- Fix the docker ignores. They weren't working at all; apparently `.dockerignore`
  has to be at the content root (which is our repository root). I've also streamlined
  the `.dockerignore` file itself.
- Avoid log messages that say "fatal: not a git repository (or any of the parent directories): .git".
- Avoid a docker networking warning[^1].

[^1]: WARN[0215] a network with name opensearch exists but was not created for project "docker_demo". Set `external: true` to use an existing network
---
 .dockerignore                          | 17 +++++++++++++++++
 config/docker_demo/.dockerignore       | 21 ---------------------
 config/docker_demo/Dockerfile          |  3 +++
 config/docker_demo/docker-compose.yaml |  2 +-
 4 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 .dockerignore
 delete mode 100644 config/docker_demo/.dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..33854110
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,17 @@
+# Mac OS X file.
+**/.DS_Store
+
+# Git
+**/.git
+
+# Documentation and License files
+**/*.md
+**/*.txt
+
+# Ignore log and temp files.
+**/log
+**/tmp
+
+# Ignore spec and signature files.
+**/spec
+**/sig
diff --git a/config/docker_demo/.dockerignore b/config/docker_demo/.dockerignore
deleted file mode 100644
index 653cbf61..00000000
--- a/config/docker_demo/.dockerignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Mac OSX file.
-.DS_Store
-/*/.DS_Store
-
-#Git
-/.git/*
-
-# Documentation
-*.md
-
-# Ignore log and temp files.
-/log/*
-/tmp/*
-/*/log/*
-/*/tmp/*
-
-# Ignore spec files.
-/*/spec/*
-
-# Ignore dockerfile
-Dockerfile
diff --git a/config/docker_demo/Dockerfile b/config/docker_demo/Dockerfile
index c2360be6..b1c37b06 100644
--- a/config/docker_demo/Dockerfile
+++ b/config/docker_demo/Dockerfile
@@ -5,6 +5,9 @@ FROM ruby:${RUBY_VERSION}
 
 WORKDIR /app
 
+# Avoid "fatal: not a git repository (or any of the parent directories): .git"
+RUN git init
+
 # Copy the minimal Gemfile and local ElasticGraph gems that we need.
 COPY config/docker_demo/Gemfile .
 COPY elasticgraph elasticgraph
diff --git a/config/docker_demo/docker-compose.yaml b/config/docker_demo/docker-compose.yaml
index 8ce18b02..f8d08106 100644
--- a/config/docker_demo/docker-compose.yaml
+++ b/config/docker_demo/docker-compose.yaml
@@ -1,7 +1,7 @@
 ---
 networks:
   default:
-    name: opensearch
+    name: elasticgraph-docker-demo
     external: false
 services:
   opensearch: