From 80d4c313c495dac9131459fe3c1ea0b4abe4f22c Mon Sep 17 00:00:00 2001 From: izzydotexe Date: Thu, 12 Dec 2024 11:11:20 -0500 Subject: [PATCH 1/3] add unity to submodules --- .gitmodules | 3 +++ unity | 1 + 2 files changed, 4 insertions(+) create mode 160000 unity diff --git a/.gitmodules b/.gitmodules index 31f6fa4..76563df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "ARC3"] path = ARC3 url = https://github.com/ARCv3/ARC3 +[submodule "unity"] + path = unity + url = https://github.com/ARCv3/unity diff --git a/unity b/unity new file mode 160000 index 0000000..77d75e9 --- /dev/null +++ b/unity @@ -0,0 +1 @@ +Subproject commit 77d75e96d3322ffbf6ee958240ec38b3a0353c7c From 64933db64bad7786efc7e87299967ca1dd0bc688 Mon Sep 17 00:00:00 2001 From: izzydotexe Date: Thu, 12 Dec 2024 11:54:42 -0500 Subject: [PATCH 2/3] add unity to docker stg --- docker-compose-stg.yml | 19 ++++++++++++++++++- unity | 2 +- unity.Dockerfile | 13 +++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 unity.Dockerfile diff --git a/docker-compose-stg.yml b/docker-compose-stg.yml index 01fb430..7c6a576 100644 --- a/docker-compose-stg.yml +++ b/docker-compose-stg.yml @@ -7,6 +7,8 @@ services: env_file: - .env image: elestio/uptime-kuma:latest + environment: + - PORT=3030 restart: always healthcheck: disable: true @@ -85,10 +87,25 @@ services: container_name: arc3-api-stg restart: on-failure ports: - - 3040:3030 + - 3040:3000 networks: - common-net-stg + unity-stg: + env_file: + - .env + depends_on: + - arc-api-stg + image: unity + build: + dockerfile: unity.Dockerfile + container_name: unity-stg + restart: on-failure + ports: + - 3050:3000 + networks: + - common-net-stg + arc-tasks-stg: env_file: - .env diff --git a/unity b/unity index 77d75e9..c48eb8f 160000 --- a/unity +++ b/unity @@ -1 +1 @@ -Subproject commit 77d75e96d3322ffbf6ee958240ec38b3a0353c7c +Subproject commit c48eb8fbbd2583f5f0ad5159ac4a2c31df6e713b diff --git a/unity.Dockerfile b/unity.Dockerfile new file mode 100644 index 0000000..5197687 --- /dev/null +++ b/unity.Dockerfile @@ -0,0 +1,13 @@ +FROM node + +RUN apt-get update && apt-get install -y npm +WORKDIR /app + +COPY ./unity/package*.json . +RUN node --max-old-space-size=1000 $(which npm) ci + +COPY ./unity/ . +RUN node --max-old-space-size=1000 $(which npm) run build + +ENTRYPOINT [ "npm", "run", "start" ] + From cc3f623f442e649950187e8d349e02fde7b014ab Mon Sep 17 00:00:00 2001 From: izzydotexe Date: Thu, 12 Dec 2024 11:56:50 -0500 Subject: [PATCH 3/3] stg fixes --- docker-compose-stg.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose-stg.yml b/docker-compose-stg.yml index 7c6a576..fc630a0 100644 --- a/docker-compose-stg.yml +++ b/docker-compose-stg.yml @@ -87,13 +87,13 @@ services: container_name: arc3-api-stg restart: on-failure ports: - - 3040:3000 + - 3040:3030 networks: - common-net-stg unity-stg: - env_file: - - .env + environment: + - PORT=3000 depends_on: - arc-api-stg image: unity @@ -105,7 +105,7 @@ services: - 3050:3000 networks: - common-net-stg - + arc-tasks-stg: env_file: - .env