From a8eb7e327f78b503837bca41d242384835a16f4c Mon Sep 17 00:00:00 2001
From: ptweezy <ptweezy@runforyour.money>
Date: Fri, 20 Dec 2024 21:55:39 -0500
Subject: [PATCH] Updated Docker Image (#1764)

* dockerfile improvement, ubuntu upgrade, reducing docker layers, increased parity with ooo project

* changing to apt-get

* reducing steps based off PR feedback

* improved comments

* revert

* you have to install curl first

* no need to change this
---
 Dockerfile | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ac824113f9..956343d9c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
-FROM ubuntu:22.04 as build
+FROM ubuntu:24.04 AS build
+
 ENV TZ=UTC
+ENV LANG=C.UTF-8
 
 # Install Required Dependencies
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
@@ -10,6 +12,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
     pkg-config \
     python3 \
     python3-pip \
+    python3-venv \
     git \
     wget \
     unzip \
@@ -18,25 +21,16 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
     clang-tidy-14 \
     clang-format-14 \
     libpng-dev && \
-    apt clean && \
+    # Add source for practicerom-dev install
+    curl https://practicerom.com/public/packages/debian/pgp.pub | apt-key add - && \ 
+    echo deb http://practicerom.com/public/packages/debian staging main >/etc/apt/sources.list.d/practicerom.list && \
+    apt-get update && \
+    apt-get install -y \
+    practicerom-dev && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Install practicerom
-RUN curl https://practicerom.com/public/packages/debian/pgp.pub | \
-    apt-key add - && echo deb http://practicerom.com/public/packages/debian staging main >/etc/apt/sources.list.d/practicerom.list && apt update
-
-RUN apt-get install -y practicerom-dev
-
-COPY requirements.txt requirements.txt
-
-RUN python3 -m pip install --no-cache-dir -r requirements.txt
-
-ENV LANG C.UTF-8
-
-RUN mkdir /mm
-
 WORKDIR /mm
-
 RUN git config --global --add safe.directory /mm
 
 ENTRYPOINT ["/bin/bash", "-c"]