From 1a2a3d9c7c02350d7a7e81e2d444fc19fbc307cc Mon Sep 17 00:00:00 2001
From: tomchop <tomchop@gmail.com>
Date: Thu, 13 Mar 2025 02:55:33 +0000
Subject: [PATCH] Improvements to dockerfiles

---
 extras/Dockerfile           | 4 ++--
 extras/docker-compose.yaml  | 3 +++
 extras/docker-entrypoint.sh | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/extras/Dockerfile b/extras/Dockerfile
index ffcce89..809c429 100644
--- a/extras/Dockerfile
+++ b/extras/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 # Python
 RUN apt-get update && apt-get install -y \
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
     git
 
 # Upgrade pip
-RUN pip3 install --upgrade pip && pip3 install poetry
+RUN pip3 install poetry --break-system-packages
 
 COPY extras/docker-entrypoint.sh /docker-entrypoint.sh
 
diff --git a/extras/docker-compose.yaml b/extras/docker-compose.yaml
index ca2bc92..9bd6754 100644
--- a/extras/docker-compose.yaml
+++ b/extras/docker-compose.yaml
@@ -6,3 +6,6 @@ services:
         dockerfile: ./extras/Dockerfile
     volumes:
         - ../:/app/
+    entrypoint: /bin/bash
+    stdin_open: true # docker run -i
+    tty: true        # docker run -t
diff --git a/extras/docker-entrypoint.sh b/extras/docker-entrypoint.sh
index 4921f9e..1e7d63c 100644
--- a/extras/docker-entrypoint.sh
+++ b/extras/docker-entrypoint.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 set -euo pipefail
-poetry shell
+$(poetry env acticate)
+
+exec "$@"