From df8765efd2f6d5480057dade6130fac93faa6cf6 Mon Sep 17 00:00:00 2001 From: George Butskivsky Date: Wed, 15 May 2024 14:17:57 +0300 Subject: [PATCH 1/3] change file name to copy to --- .gitea/workflows/deploy-main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-main.yaml b/.gitea/workflows/deploy-main.yaml index ee7662a..b8acba0 100644 --- a/.gitea/workflows/deploy-main.yaml +++ b/.gitea/workflows/deploy-main.yaml @@ -39,7 +39,7 @@ jobs: username: ${{ secrets.SSH_USERNAME }} # port: ${{ secrets.PORT }} key: ${{ secrets.SSH_PRIVATE_KEY }} - source: "docker-compose.yml" + source: "compose.yml" target: /home/${{ secrets.SSH_USERNAME }}/sm-admin/service-monitoring - name: SSH into dev-server and execute script From 5f8001af0dc30a499aaf80347dc859b6ee632edd Mon Sep 17 00:00:00 2001 From: George Butskivsky Date: Wed, 15 May 2024 14:28:50 +0300 Subject: [PATCH 2/3] change default network --- compose.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index e179a33..acf9868 100644 --- a/compose.yml +++ b/compose.yml @@ -5,4 +5,14 @@ services: dockerfile: Dockerfile ports: - 8100:8000 - image: ci.svs-tech.pro/sm-admin:latest \ No newline at end of file + image: ci.svs-tech.pro/sm-admin:latest + +networks: + default: + # Use a custom driver + driver: overlay + attachable: true + ipam: + driver: default + config: + - subnet: 172.28.0.0/24 From 68791d3942cb9d75c7671bf962374e6159b4cdee Mon Sep 17 00:00:00 2001 From: George Butskivsky Date: Wed, 15 May 2024 15:07:34 +0300 Subject: [PATCH 3/3] modified: compose.yml --- compose.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/compose.yml b/compose.yml index acf9868..5139936 100644 --- a/compose.yml +++ b/compose.yml @@ -6,13 +6,3 @@ services: ports: - 8100:8000 image: ci.svs-tech.pro/sm-admin:latest - -networks: - default: - # Use a custom driver - driver: overlay - attachable: true - ipam: - driver: default - config: - - subnet: 172.28.0.0/24