From 244a20ff6db2d7adbef571b121e2040bc28a842e Mon Sep 17 00:00:00 2001 From: maltaesousa Date: Mon, 6 Jan 2025 14:05:15 +0100 Subject: [PATCH 1/2] harbor --- deploy | 16 ++++++++++++---- docker-compose.yml | 6 ++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/deploy b/deploy index d77c8b70..3a5fe35f 100644 --- a/deploy +++ b/deploy @@ -37,12 +37,20 @@ def main(): load_env(dotenv_file) shutil.copy(dotenv_file, '.env') + target_host = os.environ.get('DOCKER_HOST') + os.environ['DOCKER_HOST'] = '' + + call_cmd(["docker", "compose", "build", "back"]) + call_cmd(["docker", "compose", "build", "front"]) + call_cmd(["docker", "compose", "push"]) + + os.environ['DOCKER_HOST'] = target_host + print('DOCKER_HOST is: {}'.format(os.environ.get('DOCKER_HOST', 'not setted'))) - call_cmd(["docker-compose", "build", "back"]) - call_cmd(["docker-compose", "build", "front"]) - call_cmd(["docker-compose", "down"]) - call_cmd(["docker-compose", "up", "-d"]) + call_cmd(["docker", "compose", "pull"]) + call_cmd(["docker", "compose", "down"]) + call_cmd(["docker", "compose", "up", "-d"]) print('\a') diff --git a/docker-compose.yml b/docker-compose.yml index ff31072b..ed3b48aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ -version: '3' - services: back: - image: sitn/infolica-back + image: ${DOCKER_BASE}-back build: context: back args: @@ -20,7 +18,7 @@ services: - TZ=Europe/Zurich front: - image: sitn/infolica-front + image: ${DOCKER_BASE}-front build: context: front args: From 7f775a24b8aeee2b9aa509ca8d746ca6db6f8ab7 Mon Sep 17 00:00:00 2001 From: maltaesousa Date: Mon, 6 Jan 2025 14:47:54 +0100 Subject: [PATCH 2/2] update version --- front/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/package.json b/front/package.json index 849895d5..078f91ef 100644 --- a/front/package.json +++ b/front/package.json @@ -1,6 +1,6 @@ { "name": "front", - "version": "0.1.0", + "version": "1.12.2", "private": true, "scripts": { "serve": "vue-cli-service serve",