From e82c1a8fa351314bb382038c40b3a765a4d9704c Mon Sep 17 00:00:00 2001 From: William Diakite Date: Thu, 24 Jul 2025 16:09:51 -0400 Subject: [PATCH 1/2] adds cms submodule --- .gitmodules | 3 +++ cms | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 cms diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..50e90cc --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "cms"] + path = cms + url = https://forgejo.ediv.xyz/alliances-transcoloniales/cms.git diff --git a/cms b/cms new file mode 160000 index 0000000..1e363f6 --- /dev/null +++ b/cms @@ -0,0 +1 @@ +Subproject commit 1e363f6c667c8e04efdccf75baa8dc4fddc51c0f From 07aec6b81636a58e0efc5c2d95909b4411896381 Mon Sep 17 00:00:00 2001 From: William Diakite Date: Thu, 24 Jul 2025 17:00:15 -0400 Subject: [PATCH 2/2] adds cms to docker compose --- .forgejo/workflows/deploy.yml | 7 +++++++ .gitignore | 2 ++ docker-compose.yml | 17 +++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index b123171..78bb863 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -19,6 +19,13 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Set up .env + run: | + echo "TOKEN_SECRET_KEY=${{ secrets.TOKEN_SECRET_KEY }}" >> ./cms/.env + echo "DB_CONNECTION=${{ vars.DB_CONNECTION }}" >> ./cms/.env + echo "DB_PATH=${{ vars.DB_PATH }}" >> ./cms/.env + + - name: Install docker-compose plugin run: | apk add --no-cache docker-cli curl diff --git a/.gitignore b/.gitignore index 3a8a09c..172269e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ Thumbs.db # Vite vite.config.js.timestamp-* vite.config.ts.timestamp-* + +.manifest diff --git a/docker-compose.yml b/docker-compose.yml index 862fb23..9f92aef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,3 +9,20 @@ services: NODE_ENV: production volumes: - /var/run/docker.sock:/var/run/docker.sock + + cms: + build: ./cms + image: alliances-cms + ports: + - "3001:1111" + environment: + - NODE_ENV=production + - TOKEN_SECRET_KEY=${TOKEN_SECRET_KEY} + - DB_PATH=${DB_PATH} + env_file: .env + volumes: + - alliance_volume:/app/.manifest + - /var/run/docker.sock:/var/run/docker.sock + +volumes: + alliances_volume: