From 7d65556c9e7f9ef0315813ede530cbd22171032f Mon Sep 17 00:00:00 2001
From: Paolo Donadeo <p.donadeo@4sigma.it>
Date: Thu, 8 Sep 2022 15:05:40 +0200
Subject: [PATCH 1/2] Latest Python 3.10 and latest Alpine + 4Sigma tools +
 poetry

---
 .gitignore |  1 +
 Dockerfile | 17 +++--------------
 2 files changed, 4 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4d67604
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.code-workspace
diff --git a/Dockerfile b/Dockerfile
index 81f781d..ba474e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10.5-alpine AS build-image
+FROM python:3.10-alpine AS build-image
 
 RUN apk update                                                          \
  && apk add --no-cache                                                  \
@@ -6,17 +6,6 @@ RUN apk update                                                          \
         make autoconf libtool postgresql-dev build-base g++ gcc         \
         unixodbc-dev freetds-dev libffi libffi-dev czmq-dev libxml2-dev \
         libxslt-dev automake cmake git openssl-dev ffmpeg libwebp-dev   \
-        cargo
+        poetry
 
-RUN /usr/local/bin/pip install poetry
-
-FROM python:3.10.5-alpine AS deploy-image
-RUN apk add --no-cache                                                  \
-        bash postgresql-client libpq jpeg-dev zlib-dev musl-dev         \
-        make autoconf libtool postgresql-dev build-base g++ gcc         \
-        unixodbc-dev freetds-dev libffi libffi-dev czmq-dev libxml2-dev \
-        libxslt-dev automake cmake git openssl-dev ffmpeg libwebp-dev   \
-        cargo
-
-COPY --from=build-image /usr/local/bin/poetry /usr/local/bin/poetry
-COPY --from=build-image /usr/local/lib/python3.10 /usr/local/lib/python3.10
+CMD ["/bin/bash"]

From 23d7bcff52a1d50c8790cbb7b05a2f34570896c8 Mon Sep 17 00:00:00 2001
From: Paolo Donadeo <p.donadeo@4sigma.it>
Date: Thu, 8 Sep 2022 15:48:06 +0200
Subject: [PATCH 2/2] Cargo is actually important

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0499882..f59aa5c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,6 @@ RUN apk update                                                          \
         make autoconf libtool postgresql-dev build-base g++ gcc         \
         unixodbc-dev freetds-dev libffi libffi-dev czmq-dev libxml2-dev \
         libxslt-dev automake cmake git openssl-dev ffmpeg libwebp-dev   \
-        poetry
+        cargo poetry
 
 CMD ["/bin/bash"]