From 49b293bc2f8937e3cf29e434b60500b66077d0bb Mon Sep 17 00:00:00 2001 From: "israel.aristide" Date: Thu, 6 Mar 2025 15:47:08 -0500 Subject: [PATCH 1/2] add ops infra module --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 76563df..4b08c67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "unity"] path = unity url = https://github.com/ARCv3/unity +[submodule "ops-infrastructure-stage"] + path = ops-infrastructure-stage + url = https://github.com/ARCv3/ops-infrastructure-stage From 2c5cdd0a996153a376e0f57c34c0ba75d140b761 Mon Sep 17 00:00:00 2001 From: "israel.aristide" Date: Mon, 5 May 2025 14:46:33 -0400 Subject: [PATCH 2/2] update monorepo --- .fleet/run.json | 12 ++++++ .fleet/settings.json | 3 ++ .gitmodules | 3 ++ ARC3 | 2 +- ARC3-API | 2 +- docker-compose-local.yml | 90 ++++++++++++++++++++++++++++++++++++++++ ops-infrastructure-live | 1 + ops-infrastructure-stage | 1 + unity | 2 +- 9 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 .fleet/run.json create mode 100644 .fleet/settings.json create mode 100644 docker-compose-local.yml create mode 160000 ops-infrastructure-live create mode 160000 ops-infrastructure-stage diff --git a/.fleet/run.json b/.fleet/run.json new file mode 100644 index 0000000..c7e162b --- /dev/null +++ b/.fleet/run.json @@ -0,0 +1,12 @@ +{ + "configurations": [ + { + "type": "dotnet", + "name": "Dotnet configuration", + "projectPath": "$WORKSPACE_DIR$/ARC3/ARC3/arc3.csproj", + "workingDir": "$WORKSPACE_DIR$/ARC3/ARC3", + "environmentFile": "$WORKSPACE_DIR$/.env", + "args": [] + } + ] +} \ No newline at end of file diff --git a/.fleet/settings.json b/.fleet/settings.json new file mode 100644 index 0000000..b88a2e6 --- /dev/null +++ b/.fleet/settings.json @@ -0,0 +1,3 @@ +{ + "toolchains": [] +} \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 4b08c67..88cc666 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "ops-infrastructure-stage"] path = ops-infrastructure-stage url = https://github.com/ARCv3/ops-infrastructure-stage +[submodule "ops-infrastructure-live"] + path = ops-infrastructure-live + url = https://github.com/ARCv3/ops-infrastructure-live \ No newline at end of file diff --git a/ARC3 b/ARC3 index c82701c..4ae59f4 160000 --- a/ARC3 +++ b/ARC3 @@ -1 +1 @@ -Subproject commit c82701c689e12eba94c30f08cc54e261282fcc2d +Subproject commit 4ae59f45b708c7d8c3b752865e8e1f6ecd1a2b16 diff --git a/ARC3-API b/ARC3-API index d8061dd..3cd9f10 160000 --- a/ARC3-API +++ b/ARC3-API @@ -1 +1 @@ -Subproject commit d8061dd47768d50abfe7ef1d98e921934b4f9a5a +Subproject commit 3cd9f107006750b9b175ed5db9b798aea39767fd diff --git a/docker-compose-local.yml b/docker-compose-local.yml new file mode 100644 index 0000000..e1ab14a --- /dev/null +++ b/docker-compose-local.yml @@ -0,0 +1,90 @@ +name: arc-local + +services: + + arc3-local: + env_file: + - .env + depends_on: + - mongo-local + image: arc3-local + build: + dockerfile: arc3.Dockerfile + container_name: arc3-local + + mongo-local: + image: mongo:7.0 + env_file: + - .env + container_name: mongo-local + restart: always + environment: + - MONGO_INITDB_ROOT_USERNAME=root + - MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD} + volumes: + - mongo_data_local:/data/db + - mongo_config_local:/data/configdb + - ./keys/mongo.keyfile:/data/mongo.keyfile + ports: + - 27018:27017 + + + mongo_admin_ui: + image: mongo-express + env_file: + - .env + environment: + - ME_CONFIG_MONGODB_ADMINUSERNAME=root + - ME_CONFIG_MONGODB_ADMINPASSWORD=${MONGO_INITDB_ROOT_PASSWORD} + - ME_CONFIG_MONGODB_SERVER=mongo-local + - ME_CONFIG_BASICAUTH_USERNAME=admin + - ME_CONFIG_BASICAUTH_PASSWORD=${EXPRESS_PWRD} + container_name: mongo_admin_ui + ports: + - 8081:8081 + + arc-api-local: + env_file: + - .env + image: arc3-api-local + build: + context: ARC3-API + dockerfile: Dockerfile + args: + - fullchain=${FULLCHAIN} + - privkey=${PRIVKEY} + container_name: arc3-api-local + restart: on-failure + ports: + - 3040:3030 + + unity-local: + environment: + - PORT=3000 + - UNITY_BASE_URI=unity.local.billiecord.com + - UNITY_API_BASE_URI=api.local.billiecord.com + depends_on: + - arc-api-local + image: unity + build: + context: unity + dockerfile: Dockerfile + container_name: unity-local + restart: on-failure + ports: + - 3050:3000 + + app: + image: 'jc21/nginx-proxy-manager:latest' + restart: unless-stopped + ports: + - '80:80' + - '81:81' + - '443:443' + volumes: + - ./data:/data + - ./letsencrypt:/etc/letsencrypt + +volumes: + mongo_data_local: + mongo_config_local: \ No newline at end of file diff --git a/ops-infrastructure-live b/ops-infrastructure-live new file mode 160000 index 0000000..3b3ae3d --- /dev/null +++ b/ops-infrastructure-live @@ -0,0 +1 @@ +Subproject commit 3b3ae3d358a97849dbce31ee3ff5ac96977dfb65 diff --git a/ops-infrastructure-stage b/ops-infrastructure-stage new file mode 160000 index 0000000..b47c1fb --- /dev/null +++ b/ops-infrastructure-stage @@ -0,0 +1 @@ +Subproject commit b47c1fbddc02dd982534b764bcaa85e49753c945 diff --git a/unity b/unity index f3f6409..b4d8ade 160000 --- a/unity +++ b/unity @@ -1 +1 @@ -Subproject commit f3f6409171c7c820b2d1220b954cfa93c76ca63d +Subproject commit b4d8ade01273ccec272583fafc24bfb37e7d3b87