From 1e43c6f92eeb1e69be490fec9cc778f7e7bd1695 Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Mon, 7 Oct 2024 23:46:37 -0400 Subject: [PATCH 1/8] ARC-011: New Login Page (#18) Co-authored-by: izzydotexe --- ARC3-API | 2 +- ARC3-DASH | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ARC3-API b/ARC3-API index 177edd7..0dc4f86 160000 --- a/ARC3-API +++ b/ARC3-API @@ -1 +1 @@ -Subproject commit 177edd73c36b2e1bf15ce6b9448e1a52ba74740a +Subproject commit 0dc4f8612cff024cf264fa2b0e904efb9c6fb024 diff --git a/ARC3-DASH b/ARC3-DASH index 332c64e..0d47253 160000 --- a/ARC3-DASH +++ b/ARC3-DASH @@ -1 +1 @@ -Subproject commit 332c64e54d83d67095b936f38f26f277ff55cc96 +Subproject commit 0d47253ee4753ec10cf83bf2be23406b441f7c55 From c585129507c35c70dcf3fb8414d73d7edd2738d7 Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:31:27 -0400 Subject: [PATCH 2/8] ARC-016: RELEASE v3.8.1 (#24) Co-authored-by: izzydotexe --- ARC3 | 2 +- ARC3-DASH | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ARC3 b/ARC3 index 7e56219..191503d 160000 --- a/ARC3 +++ b/ARC3 @@ -1 +1 @@ -Subproject commit 7e56219339461aed7105900c3a3b960676046258 +Subproject commit 191503d463f94ce9e7ff8a8694f20964af7a4c34 diff --git a/ARC3-DASH b/ARC3-DASH index 0d47253..55f6cf3 160000 --- a/ARC3-DASH +++ b/ARC3-DASH @@ -1 +1 @@ -Subproject commit 0d47253ee4753ec10cf83bf2be23406b441f7c55 +Subproject commit 55f6cf36350cc32b7bc95f3d143041dc32c3d1a6 From 81e64eb9497e51ae71dfb81264facb8a8b1ba0c2 Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:40:06 -0400 Subject: [PATCH 3/8] OOS-004: Critical dash fix (#25) Co-authored-by: izzydotexe --- ARC3-DASH | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ARC3-DASH b/ARC3-DASH index 55f6cf3..e174544 160000 --- a/ARC3-DASH +++ b/ARC3-DASH @@ -1 +1 @@ -Subproject commit 55f6cf36350cc32b7bc95f3d143041dc32c3d1a6 +Subproject commit e174544e4b610ed7430d454882e4ef527a72175e From 4ea5c018343d9c767a4f9a9789eb7b2c6e869fa2 Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Wed, 9 Oct 2024 00:02:29 -0400 Subject: [PATCH 4/8] ARC-017: uptime monitoring (#27) --------- Co-authored-by: izzydotexe --- docker-compose-stg.yml | 13 +++++++++++++ docker-compose.yml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/docker-compose-stg.yml b/docker-compose-stg.yml index 1db6248..6b2c09c 100644 --- a/docker-compose-stg.yml +++ b/docker-compose-stg.yml @@ -2,6 +2,18 @@ version: '3.8' name: arc-stg services: + + uptime-kuma-stg: + env_file: + - .env + image: elestio/uptime-kuma:latest + restart: always + healthcheck: + disable: true + volumes: + - ./kuma_data_stg:/app/data + ports: + - 3051:3001 mongo-stg: image: mongo:7.0 @@ -102,3 +114,4 @@ networks: volumes: mongo_data_stg: mongo_config_stg: + kuma_data_stg: diff --git a/docker-compose.yml b/docker-compose.yml index 73361cb..a4e18ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,18 @@ version: '3.8' services: + uptime-kuma: + env_file: + - .env + image: elestio/uptime-kuma:latest + restart: always + healthcheck: + disable: true + volumes: + - ./kuma_data:/app/data + ports: + - 3050:3001 + mongo: image: mongo:7.0 env_file: @@ -93,3 +105,4 @@ networks: volumes: mongo_data: mongo_config: + kuma_data: From ab348448a64cb3aa70bf74195a6925dbc1052993 Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Wed, 9 Oct 2024 00:06:15 -0400 Subject: [PATCH 5/8] ARC-017: uptime monitoring 2 (#28) --------- Co-authored-by: izzydotexe --- docker-compose-stg.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-stg.yml b/docker-compose-stg.yml index 6b2c09c..4eca4da 100644 --- a/docker-compose-stg.yml +++ b/docker-compose-stg.yml @@ -9,7 +9,7 @@ services: image: elestio/uptime-kuma:latest restart: always healthcheck: - disable: true + disable: true volumes: - ./kuma_data_stg:/app/data ports: diff --git a/docker-compose.yml b/docker-compose.yml index a4e18ee..9f56132 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: image: elestio/uptime-kuma:latest restart: always healthcheck: - disable: true + disable: true volumes: - ./kuma_data:/app/data ports: From 04bb47e711532648babfca36fc7429abf2957a15 Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:11:57 -0400 Subject: [PATCH 6/8] ARC-017: uptime monitoring (#29) --------- Co-authored-by: izzydotexe --- .gitignore | 2 ++ docker-compose-stg.yml | 3 ++- docker-compose.yml | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bf6094d..3ec38ea 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,8 @@ arc3/[Bb]in/ [Ll]og/ [Ll]ogs/ +kuma_data_* + # Visual Studio 2015/2017 cache/options directory .vs/ # Uncomment if you have tasks that create the project's static files in wwwroot diff --git a/docker-compose-stg.yml b/docker-compose-stg.yml index 4eca4da..01fb430 100644 --- a/docker-compose-stg.yml +++ b/docker-compose-stg.yml @@ -12,8 +12,9 @@ services: disable: true volumes: - ./kuma_data_stg:/app/data + - /var/run/docker.sock:/var/run/docker.sock:ro ports: - - 3051:3001 + - 3051:3030 mongo-stg: image: mongo:7.0 diff --git a/docker-compose.yml b/docker-compose.yml index 9f56132..3e7caca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,9 +10,11 @@ services: healthcheck: disable: true volumes: - - ./kuma_data:/app/data + - kuma_data:/app/data + - /var/run/docker.sock:/var/run/docker.sock:ro ports: - 3050:3001 + mongo: image: mongo:7.0 From 32fe33dd869fe3a1cdafcc3b7d3057d696996dbe Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Sat, 12 Oct 2024 13:50:55 -0400 Subject: [PATCH 7/8] ARC-020: RELEASE v3.8.2 (#32) Co-authored-by: Israel Aristide --- ARC3 | 2 +- ARC3-API | 2 +- ARC3-DASH | 2 +- docker-compose.yml | 16 +--------------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/ARC3 b/ARC3 index 191503d..c82701c 160000 --- a/ARC3 +++ b/ARC3 @@ -1 +1 @@ -Subproject commit 191503d463f94ce9e7ff8a8694f20964af7a4c34 +Subproject commit c82701c689e12eba94c30f08cc54e261282fcc2d diff --git a/ARC3-API b/ARC3-API index 0dc4f86..634b92a 160000 --- a/ARC3-API +++ b/ARC3-API @@ -1 +1 @@ -Subproject commit 0dc4f8612cff024cf264fa2b0e904efb9c6fb024 +Subproject commit 634b92a966c39226711e50d8b0f79860fddaf420 diff --git a/ARC3-DASH b/ARC3-DASH index e174544..1c04a44 160000 --- a/ARC3-DASH +++ b/ARC3-DASH @@ -1 +1 @@ -Subproject commit e174544e4b610ed7430d454882e4ef527a72175e +Subproject commit 1c04a44aab1046f238edc313e1f1e3565c7041fb diff --git a/docker-compose.yml b/docker-compose.yml index 3e7caca..8d6483f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,20 +2,6 @@ version: '3.8' services: - uptime-kuma: - env_file: - - .env - image: elestio/uptime-kuma:latest - restart: always - healthcheck: - disable: true - volumes: - - kuma_data:/app/data - - /var/run/docker.sock:/var/run/docker.sock:ro - ports: - - 3050:3001 - - mongo: image: mongo:7.0 env_file: @@ -66,7 +52,7 @@ services: container_name: arc3-api restart: on-failure ports: - - 3030:3030 + - 3000:3000 networks: - common-net From a8ba79f5cecaf246673ed8c6d7cf0ce6f5dd5def Mon Sep 17 00:00:00 2001 From: Izzy Aristide <44146685+IzzyDotExe@users.noreply.github.com> Date: Sat, 12 Oct 2024 14:06:59 -0400 Subject: [PATCH 8/8] OOS-004: Update docker-compose.yml (#34) --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8d6483f..17e5f6f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ services: container_name: arc3-api restart: on-failure ports: - - 3000:3000 + - 3030:3030 networks: - common-net