From 088a5a2d5575cc6a4e5eaeaad5f140e7f8272359 Mon Sep 17 00:00:00 2001 From: sergey Date: Fri, 11 Oct 2024 10:47:09 +0300 Subject: [PATCH] add actions --- .gitea/workflows/docker_build.yaml | 22 ++++++++++++++++++++++ .gitignore | 3 +-- docker/Dockerfile | 12 ++++++++++++ docker/local_redis_file/.keep | 0 docker/only_redis-compose.yaml | 7 +++---- 5 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 .gitea/workflows/docker_build.yaml delete mode 100644 docker/local_redis_file/.keep diff --git a/.gitea/workflows/docker_build.yaml b/.gitea/workflows/docker_build.yaml new file mode 100644 index 0000000..e977d23 --- /dev/null +++ b/.gitea/workflows/docker_build.yaml @@ -0,0 +1,22 @@ +name: Docker Build +on: + merge: + branches: + - main +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: build + run: | + docker login git.sm8255082.ru --username sergey --password ${{ secrets.GSP }} + docker build -t osnova-api-alert:latest -f .docker/Dockerfile . + - name: push latest + run: | + docker tag home-tg-bot:latest git.sm8255082.ru/sergey/osnova-api-alert:latest + docker push git.sm8255082.ru/sergey/osnova-api-alert:latest + - name: push curent version + run: | + docker tag home-tg-bot:latest git.sm8255082.ru/Osnova/osnova-api-alert:0.0.1 + docker push git.sm8255082.ru/sergey/osnova-api-alert:0.0.1 diff --git a/.gitignore b/.gitignore index 8ec3d66..6eacd76 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,4 @@ __pycache__ *.log .idea/ *.idea -docker/local_redis_file/data -docker/local_redis_file/redis.conf \ No newline at end of file +docker/local_redis_file/data \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index e69de29..3c3169e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -0,0 +1,12 @@ +FROM python:3.12 +ADD auth ./auth +ADD config ./config +ADD redis_db ./redis_db +ADD routers ./routers +ADD schemas ./schemas +ADD telegram ./telegram +ADD web ./web +ADD main.py ./main.py +ADD requirements.txt /requirements.txt +RUN pip install -r requirements.txt --root-user-action=ignore +CMD ["python", "main.py"] \ No newline at end of file diff --git a/docker/local_redis_file/.keep b/docker/local_redis_file/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/docker/only_redis-compose.yaml b/docker/only_redis-compose.yaml index b14dbb3..f17cb73 100644 --- a/docker/only_redis-compose.yaml +++ b/docker/only_redis-compose.yaml @@ -7,7 +7,6 @@ services: ports: - "6379:6379" volumes: - - ./local_redis_file/data:/root/redis - - ./local_redis_file/redis.conf:/usr/local/etc/redis/redis.conf - #command: ["redis-server", --protected-mode yes, --port 6379] - command: [redis-server, --protected-mode yes, --port 6379, --requirepass, P@ssw0rd!] + - ./local_redis_file/data:/data + #command: ["redis-server", --port 6379] + command: [redis-server, --protected-mode yes, --port 6379, --requirepass, P@ssw0rd!] \ No newline at end of file