From 81d33bebef3ed57b16daef678eb1ede718819d4b Mon Sep 17 00:00:00 2001 From: SERTY Date: Tue, 29 Jul 2025 19:42:55 +0300 Subject: [PATCH 1/3] test fix v1 --- .gitea/workflows/deploy.yml | 12 +++++++++++- .gitea/workflows/testing.yml | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 96df5e2..8bfe873 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,10 +24,20 @@ jobs: - name: Run new container run: | + PORT=5005 + CONTAINER_ID=$(docker ps --format '{{.ID}} {{.Ports}}' | grep ":$PORT->" | awk '{print $1}') + + if [ -n "$CONTAINER_ID" ]; then + echo "Stopping container using port $PORT..." + docker stop "$CONTAINER_ID" + docker rm "$CONTAINER_ID" + fi + docker run -d \ --name olaper \ --restart always \ - -p 5005:5005 \ + -p ${PORT}:5005 \ -e SECRET_KEY=${{ secrets.SECRET_KEY }} \ -e ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }} \ + -v mholaper_data:/app/data \ olaper:latest diff --git a/.gitea/workflows/testing.yml b/.gitea/workflows/testing.yml index 0ac62d6..4a6986b 100644 --- a/.gitea/workflows/testing.yml +++ b/.gitea/workflows/testing.yml @@ -39,6 +39,7 @@ jobs: docker run -d \ --name olaper_test \ -p 5050:5005 \ + -v /home/master/olaper/test_data:/opt/olaper/data \ -e SECRET_KEY=${{ secrets.SECRET_KEY }} \ -e ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }} \ olaper:test From 5100c5d17c03880f78b2622d76479faa45f858e1 Mon Sep 17 00:00:00 2001 From: SERTY Date: Tue, 29 Jul 2025 19:43:11 +0300 Subject: [PATCH 2/3] v1 --- .gitea/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/testing.yml b/.gitea/workflows/testing.yml index 4a6986b..fa3fc24 100644 --- a/.gitea/workflows/testing.yml +++ b/.gitea/workflows/testing.yml @@ -39,7 +39,7 @@ jobs: docker run -d \ --name olaper_test \ -p 5050:5005 \ - -v /home/master/olaper/test_data:/opt/olaper/data \ + -v /home/master/olaper_debug/data:/opt/olaper/data \ -e SECRET_KEY=${{ secrets.SECRET_KEY }} \ -e ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }} \ olaper:test From 8e757afe39b0751956985878c1a40d266635eba3 Mon Sep 17 00:00:00 2001 From: SERTY Date: Tue, 29 Jul 2025 19:52:18 +0300 Subject: [PATCH 3/3] fix testing v3 --- .gitea/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/testing.yml b/.gitea/workflows/testing.yml index fa3fc24..238eecd 100644 --- a/.gitea/workflows/testing.yml +++ b/.gitea/workflows/testing.yml @@ -39,7 +39,7 @@ jobs: docker run -d \ --name olaper_test \ -p 5050:5005 \ - -v /home/master/olaper_debug/data:/opt/olaper/data \ + -v /home/master/olaper-debug/data:/opt/olaper/data \ -e SECRET_KEY=${{ secrets.SECRET_KEY }} \ -e ENCRYPTION_KEY=${{ secrets.ENCRYPTION_KEY }} \ olaper:test