From fa1a7d0fba7b890b6270712341be7cdd5a640e87 Mon Sep 17 00:00:00 2001
From: Luke Snyder <709836+lksnyder0@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:03:24 -0400
Subject: [PATCH] Move Dockerfile

---
 .../workflows/build_elastic_common_schema_toolchain.yml   | 2 --
 Dockerfile                                                | 8 ++++++++
 docker/Dockerfile                                         | 6 ------
 {docker/scripts => scripts}/entry_point.sh                | 0
 4 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 Dockerfile
 delete mode 100644 docker/Dockerfile
 rename {docker/scripts => scripts}/entry_point.sh (100%)

diff --git a/.github/workflows/build_elastic_common_schema_toolchain.yml b/.github/workflows/build_elastic_common_schema_toolchain.yml
index 59c469887..0426edd15 100644
--- a/.github/workflows/build_elastic_common_schema_toolchain.yml
+++ b/.github/workflows/build_elastic_common_schema_toolchain.yml
@@ -44,7 +44,6 @@ jobs:
             # Tag with short sha when built on default branch
             type=sha,enable={{is_default_branch}}
 
-      # Setting up Docker Buildx with docker-container driver is required
       # Setting up Docker Buildx with docker-container driver is required
       # at the moment to be able to use a subdirectory with Git context
       - name: Set up Docker Buildx
@@ -53,7 +52,6 @@ jobs:
       - name: Build and Push
         uses: docker/build-push-action@v5
         with:
-          context: "{{defaultContext}}:docker" # Dockerfile is in docker dir
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           push: true
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..747299c47
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+FROM ubuntu:latest
+WORKDIR /ecs
+COPY . /ecs
+RUN apt update \
+    && apt install -y python3-pip \
+    && apt clean \
+    && python3 -m pip install --break-system-packages -r scripts/requirements.txt
+ENTRYPOINT ["/bin/bash", "/ecs/scripts/entry_point.sh"]
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 6a8693bf2..000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM ubuntu:latest
-RUN mkdir /ecs && apt update && apt install -y git python3-pip && apt clean
-WORKDIR /ecs
-COPY . /ecs
-RUN python3 -m pip install --break-system-packages -r /ecs/scripts/requirements.txt
-ENTRYPOINT ["/bin/bash", "/ecs/docker/scripts/entry_point.sh"]
diff --git a/docker/scripts/entry_point.sh b/scripts/entry_point.sh
similarity index 100%
rename from docker/scripts/entry_point.sh
rename to scripts/entry_point.sh