From d0b04ecfc3d6bb706c65bf45aceb54faf0cf66ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Sat, 23 Mar 2024 01:40:09 +0100 Subject: [PATCH 1/2] =?UTF-8?q?traefik=20mre=C5=BEa=20ozna=C4=8Dena=20kao?= =?UTF-8?q?=20shared?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml index f8be5c3..507df69 100644 --- a/docker-compose-deploy.yml +++ b/docker-compose-deploy.yml @@ -4,6 +4,7 @@ version: "3.7" networks: traefik-network: name: "traefik-network" + attachable: true # omogućuje da se mreža može koristiti i iz drugih stackova mongo-network: name: "mongo-network" From 2bd1402ed0c94a6978086a52792a5416a181981b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Dere=C5=BEi=C4=87?= Date: Sat, 23 Mar 2024 01:42:59 +0100 Subject: [PATCH 2/2] dodane build i deploy skripte --- README.md | 6 ++---- build.sh | 15 +++++++++++++++ deploy.sh | 4 ++++ 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100755 build.sh create mode 100755 deploy.sh diff --git a/README.md b/README.md index 08b53c3..45ee54f 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,14 @@ The deployment is done via Docker: ## Building Docker image Run the following command: ```bash -docker build . -t utility-bills-tracker:1.0.0 +build.sh ``` The image will be stored in the local Docker instance. ## Deploying Docker service Run the following command: ```bash -docker stack deploy \ - -c docker-compose-deploy.yml \ - utility-bills-tracker +deploy.sh ``` # Implementation details diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..ecb7aa7 --- /dev/null +++ b/build.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +if [ "$1" == "" ] ; then + printf "\nNisi zadao verziju Docker image-a koji treba buildati" + printf "\n\nSintaksa:\n\n build-prod-img.sh 1.0.0\n\n" + exit 1 +fi + +printf "\nBUILD START ...\n\n" + +IMAGE_VERSION=$1 + +docker build . -t utility-bills-tracker:$IMAGE_VERSION + +printf "\nBUILD DONE!\n\n" diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..f731e8b --- /dev/null +++ b/deploy.sh @@ -0,0 +1,4 @@ +#!/bin/bash +docker stack deploy \ + -c docker-compose-deploy.yml \ + utility-bills-tracker