From 16804aab66588549da84ea503a7180fff2c54834 Mon Sep 17 00:00:00 2001
From: Hassan Abouelela <hassan@hassanamr.com>
Date: Sat, 23 Jul 2022 14:49:08 +0200
Subject: Clean Up Docker Configuration

Rewrites the docker configuration to better work for this project. A
docker compose containing the dependencies from our other projects is
also included to help aid development.

Signed-off-by: Hassan Abouelela <hassan@hassanamr.com>
---
 dev/Dockerfile          | 13 +++++++------
 dev/docker-compose.yaml | 27 ---------------------------
 2 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 dev/docker-compose.yaml

(limited to 'dev')

diff --git a/dev/Dockerfile b/dev/Dockerfile
index 738fc51a..e1d8eba3 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -4,18 +4,19 @@ FROM python:3.9-slim
 ENV PIP_NO_CACHE_DIR=false \
     POETRY_VIRTUALENVS_CREATE=false
 
-ENTRYPOINT ["/bin/bash"]
-CMD ["./docker-entrypoint.sh"]
-
 # Install poetry
 RUN pip install -U poetry
 
-RUN mkdir bot
-WORKDIR /bot
+WORKDIR /app
 
 # Install project dependencies
 COPY pyproject.toml poetry.lock ./
-RUN poetry install --no-dev
+RUN poetry install --no-root
 
 # Copy the source code in last to optimize rebuilding the image
 COPY . .
+# Install again, this time with the root project
+RUN poetry install
+
+ENTRYPOINT ["python"]
+CMD ["-m", "bot"]
diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
deleted file mode 100644
index e1dca5bb..00000000
--- a/dev/docker-compose.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: "3.9"
-
-x-logging: &logging
-  logging:
-    driver: "json-file"
-    options:
-      max-file: "5"
-      max-size: "10m"
-
-x-restart-policy: &restart_policy
-  restart: unless-stopped
-
-services:
-  botcore:
-    <<: *logging
-    <<: *restart_policy
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: botcore
-
-    volumes:
-      - ./logs:/bot/logs
-      - .:/bot:ro
-
-    env_file:
-      - .env
-- 
cgit v1.2.3