From 4c657bb998b2d4a750086bb32b2a8d5bdf0457ab Mon Sep 17 00:00:00 2001
From: Mark <strategy155@gmail.com>
Date: Thu, 28 Dec 2023 22:28:11 +0200
Subject: [PATCH] finalized docker infrastructure

---
 dockerfiles/Dockerfile                      | 21 ++++++++++++++++++
 dockerfiles/save_currencies_data.Dockerfile | 24 ++-------------------
 2 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 dockerfiles/Dockerfile

diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
new file mode 100644
index 0000000..6cf8fec
--- /dev/null
+++ b/dockerfiles/Dockerfile
@@ -0,0 +1,21 @@
+FROM python:3.11-buster
+
+RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.7.1 python3 -
+
+
+ENV POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_IN_PROJECT=1 \
+    POETRY_VIRTUALENVS_CREATE=1 \
+    POETRY_CACHE_DIR=/tmp/poetry_cache
+
+WORKDIR /app
+
+COPY pyproject.toml poetry.lock /app/
+COPY market_trade /app/market_trade/
+COPY tools /app/tools
+
+RUN mkdir --parents --mode 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
+RUN --mount=type=ssh  --mount=type=cache,target=$POETRY_CACHE_DIR $HOME/.local/bin/poetry install --without dev
+
+ENV VIRTUAL_ENV=/app/.venv \
+    PATH="/app/.venv/bin:$PATH"
\ No newline at end of file
diff --git a/dockerfiles/save_currencies_data.Dockerfile b/dockerfiles/save_currencies_data.Dockerfile
index 5ecb7fb..14082a7 100644
--- a/dockerfiles/save_currencies_data.Dockerfile
+++ b/dockerfiles/save_currencies_data.Dockerfile
@@ -1,23 +1,3 @@
-FROM python:3.11-buster
+FROM registry.karmaxplan.ru/market_trade:0.2.0
 
-RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.7.1 python3 -
-
-
-ENV POETRY_NO_INTERACTION=1 \
-    POETRY_VIRTUALENVS_IN_PROJECT=1 \
-    POETRY_VIRTUALENVS_CREATE=1 \
-    POETRY_CACHE_DIR=/tmp/poetry_cache
-
-WORKDIR /app
-
-COPY pyproject.toml poetry.lock /app/
-COPY market_trade /app/market_trade/
-COPY tools /app/tools
-
-RUN mkdir --parents --mode 0700 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
-RUN --mount=type=ssh  --mount=type=cache,target=$POETRY_CACHE_DIR $HOME/.local/bin/poetry install --without dev
-
-ENV VIRTUAL_ENV=/app/.venv \
-    PATH="/app/.venv/bin:$PATH"
-
-ENTRYPOINT ["python", "tools/save_currencies_data.py"]
+ENTRYPOINT ["python", "tools/save_currencies_data.py"]
\ No newline at end of file