From c90f4307415dab2d6be255cd1b94de0301d0c00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= <roman.krcek@tietoevry.com>
Date: Sun, 4 Aug 2024 21:00:56 +0200
Subject: [PATCH] Update Dockerfile

---
 .gitignore | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Dockerfile |   7 +--
 Makefile   |   9 ++-
 3 files changed, 174 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d600739
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,165 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
+.pdm.toml
+.pdm-python
+.pdm-build/
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+
+.venv/
+.env
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index dabbcb4..593e261 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11-alpine AS base
+FROM python:3.11-slim AS base
 LABEL maintainer="Roman Krček"
 
 WORKDIR /app
@@ -12,13 +12,12 @@ RUN --mount=type=cache,target=/tmp/pip_cache \
     pip install \
     -r requirements.txt \
     --extra-index-url https://www.piwheels.org/simple \
-    --cache-dir /tmp/pip_cache \
-    --user 
+    --cache-dir /tmp/pip_cache
 
 # Runtime stage
 FROM base AS runtime
 
-COPY --from=builder /root/.local /root/.local
+COPY --from=builder /usr/local/lib /usr/local/lib
 COPY telegram_downloader_bot/ telegram_downloader_bot/
 
 VOLUME ["/data"]
diff --git a/Makefile b/Makefile
index 4e27ed3..aa6ef66 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
 docker_image := git.orebolt.cz/erman/telegram-downloader-bot
 ts := $(shell /bin/date "+%Y-%m-%d")
+platform = linux/arm/v7 # linux/amd64
 
 up:
 	sudo docker-compose up --build
 
 entry:
-	sudo docker-compose run --entrypoint sh bot
+	sudo docker pull --platform $(platform) $(docker_image):latest && \
+	sudo docker run --platform $(platform) -it -v ./data:/data --env-file .env --entrypoint sh $(docker_image):latest
 
-container:
-	sudo docker run -it --platform linux/arm/v7 -v ./data:/data --env-file .env $(docker_image):latest
+cont:
+	sudo docker pull --platform $(platform) $(docker_image):latest && \
+	sudo docker run --platform $(platform) -it -v ./data:/data --env-file .env $(docker_image):latest
 
 release:
 	sudo docker buildx use mybuilder