From 24b9f21541d0dd802cb77a4b189d942e045d0546 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Fri, 27 Feb 2026 21:34:13 -0600 Subject: [PATCH 01/53] deploy setup --- api/Dockerfile | 20 ++++++++++++++++++++ api/Program.cs | 2 +- client/Dockerfile | 20 ++++++++++++++++++++ client/nginx.conf | 12 ++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 api/Dockerfile create mode 100644 client/Dockerfile create mode 100644 client/nginx.conf diff --git a/api/Dockerfile b/api/Dockerfile new file mode 100644 index 0000000..73ed90f --- /dev/null +++ b/api/Dockerfile @@ -0,0 +1,20 @@ + +# build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build +WORKDIR /src + +COPY *.csproj . +RUN dotnet restore + +COPY . . +RUN dotnet publish -c Release -o /app/publish + +# run +FROM mcr.microsoft.com/dotnet/aspnet:10.0 +WORKDIR /app +ENV ASPNETCORE_URLS=http://+:8080 +COPY --from=build /app/publish . + +EXPOSE 8080 + +ENTRYPOINT ["dotnet", "agologum-api.dll"] diff --git a/api/Program.cs b/api/Program.cs index ee9d65d..808352b 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -19,7 +19,7 @@ var summaries = new[] "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" }; -app.MapGet("/weatherforecast", () => +app.MapGet("api/weatherforecast", () => { var forecast = Enumerable.Range(1, 5).Select(index => new WeatherForecast diff --git a/client/Dockerfile b/client/Dockerfile new file mode 100644 index 0000000..94ed182 --- /dev/null +++ b/client/Dockerfile @@ -0,0 +1,20 @@ + +# build vue app +FROM node:current-alpine AS build + +WORKDIR /app +COPY package*.json ./ +RUN npm install +COPY . . +RUN npm run build + +# serve to nginx +FROM nginx:alpine + +COPY --from=build /app/dist /usr/share/nginx/html + +RUN rm /etc/nginx/conf.d/default.conf +COPY nginx.conf /etc/nginx/conf.d/default.conf + +EXPOSE 80 +CMD ["nginx", "-g", "daemon off;"] diff --git a/client/nginx.conf b/client/nginx.conf new file mode 100644 index 0000000..d8060ad --- /dev/null +++ b/client/nginx.conf @@ -0,0 +1,12 @@ + +server { + listen 80; + server_name _; + + root /usr/share/nginx/html; + index index.html; + + location / { + try_files $uri $uri/ /index.html; + } +} From 5a309e45fedb150be34952616f7853d0347119f5 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 14:52:59 -0600 Subject: [PATCH 02/53] preliminary ci/cd setup (horrors await me) --- .gitea/workflows/deploy-api.yaml | 32 ++++++++++++++++++++++++++++ .gitea/workflows/deploy-client.yaml | 33 +++++++++++++++++++++++++++++ docker-compose.prod.yaml | 23 ++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 .gitea/workflows/deploy-api.yaml create mode 100644 .gitea/workflows/deploy-client.yaml create mode 100644 docker-compose.prod.yaml diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml new file mode 100644 index 0000000..9042d2a --- /dev/null +++ b/.gitea/workflows/deploy-api.yaml @@ -0,0 +1,32 @@ + +name: Build and Deploy API + +on: + push: + branches: + - main + +jobs: + build-and-deploy: + runs-on: docker + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Validate Registry + run: | + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.bxvard.net -u ${{ secrets.REGISTRY_USERNAME }} --password-stdin + + - name: Build Docker image + run: | + docker build -t git.bxvard.net/homeburger/agologum-api:latest ./api + + - name: Push image + run: | + docker push git.vxbard.net/homeburger/agologum-api:latest + + - name: Deploy container + run: | + docker compose -f docker-compose.prod.yaml pull agologum-api + docker compose -f docker-compose.prod.yaml up -d agologum-api \ No newline at end of file diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml new file mode 100644 index 0000000..6405a22 --- /dev/null +++ b/.gitea/workflows/deploy-client.yaml @@ -0,0 +1,33 @@ + +name: Build and Deploy Frontend + +on: + push: + branches: + - main + +jobs: + build-and-deploy: + runs-on: docker + + steps: + - uses: actions/checkout@v3 + + - name: Login to Registry + run: | + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login yourdomain.com \ + -u ${{ secrets.REGISTRY_USERNAME }} \ + --password-stdin + + - name: Build image + run: | + docker build -t yourdomain.com/owner/frontend:latest . + + - name: Push + run: | + docker push yourdomain.com/owner/frontend:latest + + - name: Deploy + run: | + docker compose -f /path/to/docker-compose.yml pull frontend + docker compose -f /path/to/docker-compose.yml up -d frontend \ No newline at end of file diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml new file mode 100644 index 0000000..73407f0 --- /dev/null +++ b/docker-compose.prod.yaml @@ -0,0 +1,23 @@ + +services: + api: + image: git.vxbard.net/homeburger/agologum-api:latest + container_name: agologum-api + restart: always + ports: + - "5000:80" + networks: + - web + + client: + image: git.vxbard.net/homeburger/agologum-client:latest + container_name: agologum-client + restart: always + ports: + - "8080:80" + networks: + - web + +networks: + web: + external: true From eea3cccd9558e32cbe97234e1d8a43c488421dd9 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 14:54:38 -0600 Subject: [PATCH 03/53] runner tag --- .gitea/workflows/deploy-api.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 9042d2a..c8ff7ce 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -8,7 +8,7 @@ on: jobs: build-and-deploy: - runs-on: docker + runs-on: debian12 steps: - name: Checkout code From 508164cbcee183735016c3841219791729ca2c54 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 14:56:48 -0600 Subject: [PATCH 04/53] remove branch requirements for testing --- .gitea/workflows/deploy-api.yaml | 8 ++++---- .gitea/workflows/deploy-client.yaml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index c8ff7ce..5b45160 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -1,10 +1,10 @@ name: Build and Deploy API -on: - push: - branches: - - main +#on: +# push: +# branches: +# - main jobs: build-and-deploy: diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 6405a22..6a68d7e 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -1,14 +1,14 @@ name: Build and Deploy Frontend -on: - push: - branches: - - main +#on: +# push: +# branches: +# - main jobs: build-and-deploy: - runs-on: docker + runs-on: debian12 steps: - uses: actions/checkout@v3 From 489862021488e8c7ee42882e85ca94867663db45 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 14:58:51 -0600 Subject: [PATCH 05/53] oops --- .gitea/workflows/deploy-api.yaml | 9 +++++---- .gitea/workflows/deploy-client.yaml | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 5b45160..2e2e1a2 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -1,10 +1,11 @@ name: Build and Deploy API -#on: -# push: -# branches: -# - main +on: + push: + branches: + - main + - feature/ci-cd jobs: build-and-deploy: diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 6a68d7e..0b5be0e 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -1,10 +1,11 @@ name: Build and Deploy Frontend -#on: -# push: -# branches: -# - main +on: + push: + branches: + - main + - feature/ci-cd jobs: build-and-deploy: From 579872bc78895e7baf24faffcc5890adb739dceb Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:01:58 -0600 Subject: [PATCH 06/53] only docus on client for now --- .gitea/workflows/deploy-api.yaml | 4 +++- .gitea/workflows/deploy-client.yaml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 2e2e1a2..efc10f6 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -5,11 +5,13 @@ on: push: branches: - main - - feature/ci-cd + #- feature/ci-cd jobs: build-and-deploy: runs-on: debian12 + container: + image: docker:24-dind steps: - name: Checkout code diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 0b5be0e..155fd7b 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -10,6 +10,8 @@ on: jobs: build-and-deploy: runs-on: debian12 + container: + image: docker:24-dind steps: - uses: actions/checkout@v3 From e54b7eaa313f95342afa5104f817ab43c54088c9 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:03:50 -0600 Subject: [PATCH 07/53] use nodes docker image --- .gitea/workflows/deploy-client.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 155fd7b..3d5ad1d 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: docker:24-dind + image: node:bookworm steps: - uses: actions/checkout@v3 From 38a3c59517587d20b19289b7dfba6a12d59bdcc0 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:05:47 -0600 Subject: [PATCH 08/53] maybe this docker image will work --- .gitea/workflows/deploy-api.yaml | 4 ++-- .gitea/workflows/deploy-client.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index efc10f6..fd34692 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -5,13 +5,13 @@ on: push: branches: - main - #- feature/ci-cd + - feature/ci-cd jobs: build-and-deploy: runs-on: debian12 container: - image: docker:24-dind + image: docker:24-cli steps: - name: Checkout code diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 3d5ad1d..226bd4f 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: node:bookworm + image: docker:24-cli steps: - uses: actions/checkout@v3 From 87768ffc21722bebfd19146af2828d78f2aed7b0 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:13:55 -0600 Subject: [PATCH 09/53] when in doubt ubuntu:latest --- .gitea/workflows/deploy-api.yaml | 2 +- .gitea/workflows/deploy-client.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index fd34692..a8e3668 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: docker:24-cli + image: ubuntu-latest steps: - name: Checkout code diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 226bd4f..98149e1 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: docker:24-cli + image: ubuntu-latest steps: - uses: actions/checkout@v3 From e3b4794f2b6d7b44dcb1067f77d96181994b9bcc Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:14:43 -0600 Subject: [PATCH 10/53] wrong version oops --- .gitea/workflows/deploy-api.yaml | 2 +- .gitea/workflows/deploy-client.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index a8e3668..9d3dbb7 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: ubuntu-latest + image: ubuntu:22.04 steps: - name: Checkout code diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 98149e1..3ce47b3 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: ubuntu-latest + image: ubuntu:22.04 steps: - uses: actions/checkout@v3 From 0826d56249108081528143d7f8da52dccd69895d Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:21:02 -0600 Subject: [PATCH 11/53] re: image --- .gitea/workflows/deploy-api.yaml | 2 +- .gitea/workflows/deploy-client.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 9d3dbb7..5a56611 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: ubuntu:22.04 + image: node:current-alpine3.23 steps: - name: Checkout code diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 3ce47b3..b01db74 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: ubuntu:22.04 + image: current-alpine3.23 steps: - uses: actions/checkout@v3 From 4fb582c500c0850abf355c90a8b047fc21325f20 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:40:14 -0600 Subject: [PATCH 12/53] test --- .gitea/workflows/deploy-client.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index b01db74..bcd315b 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: current-alpine3.23 + image: git.vxbard.net/homeburger/bard-cpp-builder:1.0 steps: - uses: actions/checkout@v3 From c44ebca61f8eb2a0c1e72ec7073c0fde6afa85ea Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:43:43 -0600 Subject: [PATCH 13/53] fix urls --- .gitea/workflows/deploy-client.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index bcd315b..034675a 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -18,17 +18,17 @@ jobs: - name: Login to Registry run: | - echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login yourdomain.com \ + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.vxbard.net \ -u ${{ secrets.REGISTRY_USERNAME }} \ --password-stdin - name: Build image run: | - docker build -t yourdomain.com/owner/frontend:latest . + docker build -t git.vxbard.net/homeburger/agologum-client:latest ./client - name: Push run: | - docker push yourdomain.com/owner/frontend:latest + docker push git.vxbard.net/homeburger/agologum-client:latest - name: Deploy run: | From 46f0b16ff3199a4b6dce8352334474066aec052a Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:51:09 -0600 Subject: [PATCH 14/53] separate the docker-compose files --- .gitea/workflows/deploy-client.yaml | 4 ++-- docker-compose.prod.yaml | 23 ----------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 docker-compose.prod.yaml diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 034675a..a93f2f8 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -32,5 +32,5 @@ jobs: - name: Deploy run: | - docker compose -f /path/to/docker-compose.yml pull frontend - docker compose -f /path/to/docker-compose.yml up -d frontend \ No newline at end of file + docker compose -f docker-compose.prod.yml pull agologum-client + docker compose -f docker-compose.prod.yml up -d agologum-client \ No newline at end of file diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml deleted file mode 100644 index 73407f0..0000000 --- a/docker-compose.prod.yaml +++ /dev/null @@ -1,23 +0,0 @@ - -services: - api: - image: git.vxbard.net/homeburger/agologum-api:latest - container_name: agologum-api - restart: always - ports: - - "5000:80" - networks: - - web - - client: - image: git.vxbard.net/homeburger/agologum-client:latest - container_name: agologum-client - restart: always - ports: - - "8080:80" - networks: - - web - -networks: - web: - external: true From 18c62f38450faeeb97d378cc9dbdfabf8d7933a6 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:51:21 -0600 Subject: [PATCH 15/53] re: add --- docker-compose-api.prod.yaml | 15 +++++++++++++++ docker-compose-client.prod.yaml | 14 ++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 docker-compose-api.prod.yaml create mode 100644 docker-compose-client.prod.yaml diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml new file mode 100644 index 0000000..59f5e3c --- /dev/null +++ b/docker-compose-api.prod.yaml @@ -0,0 +1,15 @@ + +services: + api: + image: git.vxbard.net/homeburger/agologum-api:latest + container_name: agologum-api + restart: always + ports: + - "5000:80" + networks: + - web + +networks: + web: + external: true + \ No newline at end of file diff --git a/docker-compose-client.prod.yaml b/docker-compose-client.prod.yaml new file mode 100644 index 0000000..a89ea56 --- /dev/null +++ b/docker-compose-client.prod.yaml @@ -0,0 +1,14 @@ + +services: + client: + image: git.vxbard.net/homeburger/agologum-client:latest + container_name: agologum-client + restart: always + ports: + - "8080:80" + networks: + - web + +networks: + web: + external: true From e241cf098e40879c53139e08bcf4ac52c1cb5f34 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:52:26 -0600 Subject: [PATCH 16/53] change urls --- .gitea/workflows/deploy-api.yaml | 4 ++-- .gitea/workflows/deploy-client.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 5a56611..e009762 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -31,5 +31,5 @@ jobs: - name: Deploy container run: | - docker compose -f docker-compose.prod.yaml pull agologum-api - docker compose -f docker-compose.prod.yaml up -d agologum-api \ No newline at end of file + docker compose -f docker-compose-api.prod.yaml pull agologum-api + docker compose -f docker-compose-api.prod.yaml up -d agologum-api \ No newline at end of file diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index a93f2f8..5344559 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -32,5 +32,5 @@ jobs: - name: Deploy run: | - docker compose -f docker-compose.prod.yml pull agologum-client - docker compose -f docker-compose.prod.yml up -d agologum-client \ No newline at end of file + docker compose -f docker-compose-client.prod.yml pull agologum-client + docker compose -f docker-compose-client.prod.yml up -d agologum-client \ No newline at end of file From 808c93e0e85e43f7be483773afabd4a4a6ce5bbc Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:52:57 -0600 Subject: [PATCH 17/53] omg its yaml not yml --- .gitea/workflows/deploy-client.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 5344559..8726bb7 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -32,5 +32,5 @@ jobs: - name: Deploy run: | - docker compose -f docker-compose-client.prod.yml pull agologum-client - docker compose -f docker-compose-client.prod.yml up -d agologum-client \ No newline at end of file + docker compose -f docker-compose-client.prod.yaml pull agologum-client + docker compose -f docker-compose-client.prod.yaml up -d agologum-client \ No newline at end of file From 035f0be8f0a0d31cb93a3942b0f2ab52f4216ce5 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 15:54:05 -0600 Subject: [PATCH 18/53] change names in docker-compose --- docker-compose-api.prod.yaml | 2 +- docker-compose-client.prod.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml index 59f5e3c..79aa9ab 100644 --- a/docker-compose-api.prod.yaml +++ b/docker-compose-api.prod.yaml @@ -1,6 +1,6 @@ services: - api: + agologum-api: image: git.vxbard.net/homeburger/agologum-api:latest container_name: agologum-api restart: always diff --git a/docker-compose-client.prod.yaml b/docker-compose-client.prod.yaml index a89ea56..92ff791 100644 --- a/docker-compose-client.prod.yaml +++ b/docker-compose-client.prod.yaml @@ -1,6 +1,6 @@ services: - client: + agologum-client: image: git.vxbard.net/homeburger/agologum-client:latest container_name: agologum-client restart: always From e5ca5f1dc6ec97d61137d97d59eb6ae64b90498c Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 16:10:07 -0600 Subject: [PATCH 19/53] rm network config from docker-compose --- .gitea/workflows/deploy-client.yaml | 3 ++- docker-compose-api.prod.yaml | 7 ------- docker-compose-client.prod.yaml | 7 +------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 8726bb7..d1d9d42 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -33,4 +33,5 @@ jobs: - name: Deploy run: | docker compose -f docker-compose-client.prod.yaml pull agologum-client - docker compose -f docker-compose-client.prod.yaml up -d agologum-client \ No newline at end of file + docker compose -f docker-compose-client.prod.yaml up -d agologum-client + \ No newline at end of file diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml index 79aa9ab..80b6fa2 100644 --- a/docker-compose-api.prod.yaml +++ b/docker-compose-api.prod.yaml @@ -6,10 +6,3 @@ services: restart: always ports: - "5000:80" - networks: - - web - -networks: - web: - external: true - \ No newline at end of file diff --git a/docker-compose-client.prod.yaml b/docker-compose-client.prod.yaml index 92ff791..7cf6298 100644 --- a/docker-compose-client.prod.yaml +++ b/docker-compose-client.prod.yaml @@ -6,9 +6,4 @@ services: restart: always ports: - "8080:80" - networks: - - web - -networks: - web: - external: true + \ No newline at end of file From 0cc9f39416b886ba1adbdd6264fa8c704c593b20 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 16:12:55 -0600 Subject: [PATCH 20/53] force-recreate deployment container --- .gitea/workflows/deploy-api.yaml | 4 ++-- .gitea/workflows/deploy-client.yaml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index e009762..434e86c 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -11,7 +11,7 @@ jobs: build-and-deploy: runs-on: debian12 container: - image: node:current-alpine3.23 + image: git.vxbard.net/homeburger/bard-cpp-builder:1.0 steps: - name: Checkout code @@ -32,4 +32,4 @@ jobs: - name: Deploy container run: | docker compose -f docker-compose-api.prod.yaml pull agologum-api - docker compose -f docker-compose-api.prod.yaml up -d agologum-api \ No newline at end of file + docker compose -f docker-compose-api.prod.yaml up -d agologum-api --force-recreate --remove-orphans \ No newline at end of file diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index d1d9d42..ae410d0 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -33,5 +33,4 @@ jobs: - name: Deploy run: | docker compose -f docker-compose-client.prod.yaml pull agologum-client - docker compose -f docker-compose-client.prod.yaml up -d agologum-client - \ No newline at end of file + docker compose -f docker-compose-client.prod.yaml up -d agologum-client --force-recreate --remove-orphans From 3a6f26dd7af8b7281401a3006f3b26b8fbfe5577 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 16:15:53 -0600 Subject: [PATCH 21/53] re: force --- .gitea/workflows/deploy-api.yaml | 8 +++++--- .gitea/workflows/deploy-client.yaml | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 434e86c..24f621b 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -19,9 +19,11 @@ jobs: - name: Validate Registry run: | - echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.bxvard.net -u ${{ secrets.REGISTRY_USERNAME }} --password-stdin + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.vxbard.net \ + -u ${{ secrets.REGISTRY_USERNAME }} \ + --password-stdin - - name: Build Docker image + - name: Build image run: | docker build -t git.bxvard.net/homeburger/agologum-api:latest ./api @@ -32,4 +34,4 @@ jobs: - name: Deploy container run: | docker compose -f docker-compose-api.prod.yaml pull agologum-api - docker compose -f docker-compose-api.prod.yaml up -d agologum-api --force-recreate --remove-orphans \ No newline at end of file + docker compose -f docker-compose-api.prod.yaml up -d --force-recreate --remove-orphans agologum-api \ No newline at end of file diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index ae410d0..f1bfca6 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -14,9 +14,10 @@ jobs: image: git.vxbard.net/homeburger/bard-cpp-builder:1.0 steps: - - uses: actions/checkout@v3 + - name: Checkout code + uses: actions/checkout@v3 - - name: Login to Registry + - name: Validate Registry run: | echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.vxbard.net \ -u ${{ secrets.REGISTRY_USERNAME }} \ @@ -33,4 +34,4 @@ jobs: - name: Deploy run: | docker compose -f docker-compose-client.prod.yaml pull agologum-client - docker compose -f docker-compose-client.prod.yaml up -d agologum-client --force-recreate --remove-orphans + docker compose -f docker-compose-client.prod.yaml up -d --force-recreate --remove-orphans agologum-client From cfc17b76dd19ba50721ab51acf98b71d1bf140c5 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 16:17:53 -0600 Subject: [PATCH 22/53] remove name from up --- .gitea/workflows/deploy-api.yaml | 4 ++-- .gitea/workflows/deploy-client.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 24f621b..4f1ad9d 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -5,7 +5,7 @@ on: push: branches: - main - - feature/ci-cd + #- feature/ci-cd jobs: build-and-deploy: @@ -34,4 +34,4 @@ jobs: - name: Deploy container run: | docker compose -f docker-compose-api.prod.yaml pull agologum-api - docker compose -f docker-compose-api.prod.yaml up -d --force-recreate --remove-orphans agologum-api \ No newline at end of file + docker compose -f docker-compose-api.prod.yaml up -d --force-recreate --remove-orphans \ No newline at end of file diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index f1bfca6..db0a1a9 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -34,4 +34,4 @@ jobs: - name: Deploy run: | docker compose -f docker-compose-client.prod.yaml pull agologum-client - docker compose -f docker-compose-client.prod.yaml up -d --force-recreate --remove-orphans agologum-client + docker compose -f docker-compose-client.prod.yaml up -d --force-recreate --remove-orphans From dd81186a2839eae2f60cb40659d7961301f64d24 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 16:18:40 -0600 Subject: [PATCH 23/53] re: again --- .gitea/workflows/deploy-client.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index db0a1a9..9bd7332 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -33,5 +33,5 @@ jobs: - name: Deploy run: | - docker compose -f docker-compose-client.prod.yaml pull agologum-client + docker compose -f docker-compose-client.prod.yaml pull docker compose -f docker-compose-client.prod.yaml up -d --force-recreate --remove-orphans From 2ab1db131d3d12ead1905f231a843fadda5f7a4f Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 16:21:32 -0600 Subject: [PATCH 24/53] do the same for the api job --- .gitea/workflows/deploy-api.yaml | 6 +++--- .gitea/workflows/deploy-client.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 4f1ad9d..a20264d 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -5,7 +5,7 @@ on: push: branches: - main - #- feature/ci-cd + - feature/ci-cd jobs: build-and-deploy: @@ -25,7 +25,7 @@ jobs: - name: Build image run: | - docker build -t git.bxvard.net/homeburger/agologum-api:latest ./api + docker build -t git.vxbard.net/homeburger/agologum-api:latest ./api - name: Push image run: | @@ -34,4 +34,4 @@ jobs: - name: Deploy container run: | docker compose -f docker-compose-api.prod.yaml pull agologum-api - docker compose -f docker-compose-api.prod.yaml up -d --force-recreate --remove-orphans \ No newline at end of file + docker compose -f docker-compose-api.prod.yaml up -d --force-recreate --remove-orphans agologum-api diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 9bd7332..f1bfca6 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -33,5 +33,5 @@ jobs: - name: Deploy run: | - docker compose -f docker-compose-client.prod.yaml pull - docker compose -f docker-compose-client.prod.yaml up -d --force-recreate --remove-orphans + docker compose -f docker-compose-client.prod.yaml pull agologum-client + docker compose -f docker-compose-client.prod.yaml up -d --force-recreate --remove-orphans agologum-client From 3875e116609ca907fadb549caaa9a1d739f03167 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 16:28:04 -0600 Subject: [PATCH 25/53] dont remove orphans --- .gitea/workflows/deploy-api.yaml | 2 +- .gitea/workflows/deploy-client.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index a20264d..ee92e4e 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -34,4 +34,4 @@ jobs: - name: Deploy container run: | docker compose -f docker-compose-api.prod.yaml pull agologum-api - docker compose -f docker-compose-api.prod.yaml up -d --force-recreate --remove-orphans agologum-api + docker compose -f docker-compose-api.prod.yaml up -d --force-recreate agologum-api diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index f1bfca6..a946d65 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -34,4 +34,4 @@ jobs: - name: Deploy run: | docker compose -f docker-compose-client.prod.yaml pull agologum-client - docker compose -f docker-compose-client.prod.yaml up -d --force-recreate --remove-orphans agologum-client + docker compose -f docker-compose-client.prod.yaml up -d --force-recreate agologum-client From a939fe2549a8da9eea937beac03bf8af21d84865 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 18:33:41 -0600 Subject: [PATCH 26/53] fix api url --- api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/Dockerfile b/api/Dockerfile index 73ed90f..7691d77 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -12,7 +12,7 @@ RUN dotnet publish -c Release -o /app/publish # run FROM mcr.microsoft.com/dotnet/aspnet:10.0 WORKDIR /app -ENV ASPNETCORE_URLS=http://+:8080 +ENV ASPNETCORE_URLS=http://+:5000 COPY --from=build /app/publish . EXPOSE 8080 From fdbcdd2d01ff8dd90211a7cfe82fa5e18a448812 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 18:34:20 -0600 Subject: [PATCH 27/53] how about now ? --- api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/Dockerfile b/api/Dockerfile index 7691d77..098a543 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -15,6 +15,6 @@ WORKDIR /app ENV ASPNETCORE_URLS=http://+:5000 COPY --from=build /app/publish . -EXPOSE 8080 +EXPOSE 5000 ENTRYPOINT ["dotnet", "agologum-api.dll"] From 553006f36b29e26de18c4b415894c6193361418f Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 18:46:22 -0600 Subject: [PATCH 28/53] re-do api dockerfile --- api/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 098a543..7eed9e8 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -3,10 +3,10 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src -COPY *.csproj . +COPY api/*.csproj . RUN dotnet restore -COPY . . +COPY api/. . RUN dotnet publish -c Release -o /app/publish # run From f27a71dc35618941c13c595319905fb5a0fcf9e6 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 18:48:52 -0600 Subject: [PATCH 29/53] test ports --- api/Dockerfile | 6 +++--- docker-compose-api.prod.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 7eed9e8..ca64b1e 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -3,17 +3,17 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /src -COPY api/*.csproj . +COPY *.csproj ./ RUN dotnet restore -COPY api/. . +COPY . ./ RUN dotnet publish -c Release -o /app/publish # run FROM mcr.microsoft.com/dotnet/aspnet:10.0 WORKDIR /app ENV ASPNETCORE_URLS=http://+:5000 -COPY --from=build /app/publish . +COPY --from=build /app/publish ./ EXPOSE 5000 diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml index 80b6fa2..17d2751 100644 --- a/docker-compose-api.prod.yaml +++ b/docker-compose-api.prod.yaml @@ -5,4 +5,4 @@ services: container_name: agologum-api restart: always ports: - - "5000:80" + - "5000:5000" From 10cf7adb1e672e6f0eb45ce8c49982a4ff6e7767 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 18:50:04 -0600 Subject: [PATCH 30/53] undo what I last did --- docker-compose-api.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml index 17d2751..80b6fa2 100644 --- a/docker-compose-api.prod.yaml +++ b/docker-compose-api.prod.yaml @@ -5,4 +5,4 @@ services: container_name: agologum-api restart: always ports: - - "5000:5000" + - "5000:80" From bc411328689a7ae774bac4ea7a50add20409b36c Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 18:53:41 -0600 Subject: [PATCH 31/53] test --- docker-compose-api.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml index 80b6fa2..17d2751 100644 --- a/docker-compose-api.prod.yaml +++ b/docker-compose-api.prod.yaml @@ -5,4 +5,4 @@ services: container_name: agologum-api restart: always ports: - - "5000:80" + - "5000:5000" From 8c5998d9645ce8c91daec3cf46f80e97662e896e Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 18:56:52 -0600 Subject: [PATCH 32/53] retest --- docker-compose-api.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml index 17d2751..80b6fa2 100644 --- a/docker-compose-api.prod.yaml +++ b/docker-compose-api.prod.yaml @@ -5,4 +5,4 @@ services: container_name: agologum-api restart: always ports: - - "5000:5000" + - "5000:80" From 110e38daafb6068a74136416b5e4c078766873ba Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 18:58:39 -0600 Subject: [PATCH 33/53] revert --- docker-compose-api.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml index 80b6fa2..17d2751 100644 --- a/docker-compose-api.prod.yaml +++ b/docker-compose-api.prod.yaml @@ -5,4 +5,4 @@ services: container_name: agologum-api restart: always ports: - - "5000:80" + - "5000:5000" From 3a29070ef3948c8ec2bb9785bab2d9cd2e02e23d Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 19:02:39 -0600 Subject: [PATCH 34/53] proxy configuration for dotnet api --- api/Program.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/api/Program.cs b/api/Program.cs index 808352b..0ddd16f 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -1,5 +1,12 @@ var builder = WebApplication.CreateBuilder(args); +builder.Services.Configure(options => +{ + options.ForwardedHeaders = + Microsoft.AspNetCore.HttpOverrides.ForwardedHeaders.XForwardedFor | + Microsoft.AspNetCore.HttpOverrides.ForwardedHeaders.XForwardedProto; +}); + // Add services to the container. // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi builder.Services.AddOpenApi(); @@ -12,6 +19,7 @@ if (app.Environment.IsDevelopment()) app.MapOpenApi(); } +app.UseForwardedHeaders(); app.UseHttpsRedirection(); var summaries = new[] From f08d5851c1421457254684d3f68da292e195f56a Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 19:09:06 -0600 Subject: [PATCH 35/53] rebuild program.cs --- api/Program.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/api/Program.cs b/api/Program.cs index 0ddd16f..afccc32 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -1,10 +1,12 @@ -var builder = WebApplication.CreateBuilder(args); +using Microsoft.AspNetCore.HttpOverrides; + +var builder = WebApplication.CreateBuilder(args); builder.Services.Configure(options => { - options.ForwardedHeaders = - Microsoft.AspNetCore.HttpOverrides.ForwardedHeaders.XForwardedFor | - Microsoft.AspNetCore.HttpOverrides.ForwardedHeaders.XForwardedProto; + options.ForwardedHeaders = + ForwardedHeaders.XForwardedFor | + ForwardedHeaders.XForwardedProto; }); // Add services to the container. @@ -13,13 +15,14 @@ builder.Services.AddOpenApi(); var app = builder.Build(); +app.UseForwardedHeaders(); + // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { app.MapOpenApi(); } -app.UseForwardedHeaders(); app.UseHttpsRedirection(); var summaries = new[] From 9aa0052531c91deced023652aa8065b106c401a3 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 19:14:26 -0600 Subject: [PATCH 36/53] explicitly set https port --- api/appsettings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/appsettings.json b/api/appsettings.json index 10f68b8..822760b 100644 --- a/api/appsettings.json +++ b/api/appsettings.json @@ -5,5 +5,6 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "https_port": 443 } From d18a1a1680273c0703ae4c2ad9749f7c8198bd9d Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 19:47:30 -0600 Subject: [PATCH 37/53] whats my issue --- api/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/Program.cs b/api/Program.cs index afccc32..9b462a6 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -23,7 +23,7 @@ if (app.Environment.IsDevelopment()) app.MapOpenApi(); } -app.UseHttpsRedirection(); +//app.UseHttpsRedirection(); var summaries = new[] { From bf76634a38424911b0a302c501e8ca0bc6408870 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 19:53:22 -0600 Subject: [PATCH 38/53] different api routing --- api/Program.cs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/api/Program.cs b/api/Program.cs index 9b462a6..95cdc92 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -2,12 +2,12 @@ using Microsoft.AspNetCore.HttpOverrides; var builder = WebApplication.CreateBuilder(args); -builder.Services.Configure(options => -{ - options.ForwardedHeaders = - ForwardedHeaders.XForwardedFor | - ForwardedHeaders.XForwardedProto; -}); +//builder.Services.Configure(options => +//{ +// options.ForwardedHeaders = +// ForwardedHeaders.XForwardedFor | +// ForwardedHeaders.XForwardedProto; +//}); // Add services to the container. // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi @@ -15,22 +15,21 @@ builder.Services.AddOpenApi(); var app = builder.Build(); -app.UseForwardedHeaders(); - // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { app.MapOpenApi(); } -//app.UseHttpsRedirection(); +//app.UseForwardedHeaders(); +app.UseHttpsRedirection(); var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" }; -app.MapGet("api/weatherforecast", () => +app.MapGet("weatherforecast", () => { var forecast = Enumerable.Range(1, 5).Select(index => new WeatherForecast From 7246dcc997de8b7c26042ebf4001b3e0ec3fd729 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 19:55:29 -0600 Subject: [PATCH 39/53] turns out you do need forwarded headers --- api/Program.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/Program.cs b/api/Program.cs index 95cdc92..dc44f26 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -2,12 +2,12 @@ using Microsoft.AspNetCore.HttpOverrides; var builder = WebApplication.CreateBuilder(args); -//builder.Services.Configure(options => -//{ -// options.ForwardedHeaders = -// ForwardedHeaders.XForwardedFor | -// ForwardedHeaders.XForwardedProto; -//}); +builder.Services.Configure(options => +{ + options.ForwardedHeaders = + ForwardedHeaders.XForwardedFor | + ForwardedHeaders.XForwardedProto; +}); // Add services to the container. // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi @@ -21,7 +21,7 @@ if (app.Environment.IsDevelopment()) app.MapOpenApi(); } -//app.UseForwardedHeaders(); +app.UseForwardedHeaders(); app.UseHttpsRedirection(); var summaries = new[] From fa7941badaf36d8e872178a94cde48a241d983af Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 19:57:39 -0600 Subject: [PATCH 40/53] im still skewptical --- api/Program.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/Program.cs b/api/Program.cs index dc44f26..895bfa6 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -2,12 +2,12 @@ using Microsoft.AspNetCore.HttpOverrides; var builder = WebApplication.CreateBuilder(args); -builder.Services.Configure(options => -{ - options.ForwardedHeaders = - ForwardedHeaders.XForwardedFor | - ForwardedHeaders.XForwardedProto; -}); +//builder.Services.Configure(options => +//{ +// options.ForwardedHeaders = +// ForwardedHeaders.XForwardedFor | +// ForwardedHeaders.XForwardedProto; +//}); // Add services to the container. // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi @@ -21,7 +21,7 @@ if (app.Environment.IsDevelopment()) app.MapOpenApi(); } -app.UseForwardedHeaders(); +//app.UseForwardedHeaders(); app.UseHttpsRedirection(); var summaries = new[] @@ -29,7 +29,7 @@ var summaries = new[] "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" }; -app.MapGet("weatherforecast", () => +app.MapGet("api/weatherforecast", () => { var forecast = Enumerable.Range(1, 5).Select(index => new WeatherForecast From 6fd5abcaa9bf1ad90f03d09cff55d1253de592d5 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 19:58:09 -0600 Subject: [PATCH 41/53] definitive. --- api/Program.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/Program.cs b/api/Program.cs index 895bfa6..2c29cf4 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -2,12 +2,12 @@ using Microsoft.AspNetCore.HttpOverrides; var builder = WebApplication.CreateBuilder(args); -//builder.Services.Configure(options => -//{ -// options.ForwardedHeaders = -// ForwardedHeaders.XForwardedFor | -// ForwardedHeaders.XForwardedProto; -//}); +builder.Services.Configure(options => +{ + options.ForwardedHeaders = + ForwardedHeaders.XForwardedFor | + ForwardedHeaders.XForwardedProto; +}); // Add services to the container. // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi @@ -21,7 +21,7 @@ if (app.Environment.IsDevelopment()) app.MapOpenApi(); } -//app.UseForwardedHeaders(); +app.UseForwardedHeaders(); app.UseHttpsRedirection(); var summaries = new[] From 90739763ce0e8dc4b26cf44c62a22857953235e2 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:01:59 -0600 Subject: [PATCH 42/53] bro what did I change --- api/Program.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/Program.cs b/api/Program.cs index 2c29cf4..afccc32 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -15,13 +15,14 @@ builder.Services.AddOpenApi(); var app = builder.Build(); +app.UseForwardedHeaders(); + // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { app.MapOpenApi(); } -app.UseForwardedHeaders(); app.UseHttpsRedirection(); var summaries = new[] From 6d2f6191d2e574f3d4b079e0e2851a8e8831bc64 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:04:21 -0600 Subject: [PATCH 43/53] ? --- api/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/Program.cs b/api/Program.cs index afccc32..9b462a6 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -23,7 +23,7 @@ if (app.Environment.IsDevelopment()) app.MapOpenApi(); } -app.UseHttpsRedirection(); +//app.UseHttpsRedirection(); var summaries = new[] { From 80ee3dcd0d9350d0f36908d624013e6b88cb34e5 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:06:48 -0600 Subject: [PATCH 44/53] re: dotnet proxy config --- api/Program.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/api/Program.cs b/api/Program.cs index 9b462a6..1ed5777 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -7,6 +7,9 @@ builder.Services.Configure(options => options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto; + + options.KnownNetworks.Clear(); + options.KnownProxies.Clear(); }); // Add services to the container. From e2e1af047cbe5ca4b94984afc95e06176ba8e65c Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:07:20 -0600 Subject: [PATCH 45/53] re: dotnet proxy config --- api/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/Program.cs b/api/Program.cs index 1ed5777..750db85 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -26,7 +26,7 @@ if (app.Environment.IsDevelopment()) app.MapOpenApi(); } -//app.UseHttpsRedirection(); +app.UseHttpsRedirection(); var summaries = new[] { From 5ffbd518adc88ec50395a34bd1bd9de5f757a61b Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:10:48 -0600 Subject: [PATCH 46/53] move docker composes into their directories --- .gitea/workflows/deploy-api.yaml | 4 ++-- .gitea/workflows/deploy-client.yaml | 4 ++-- api/Program.cs | 2 ++ docker-compose-api.prod.yaml | 8 -------- docker-compose-client.prod.yaml | 9 --------- 5 files changed, 6 insertions(+), 21 deletions(-) delete mode 100644 docker-compose-api.prod.yaml delete mode 100644 docker-compose-client.prod.yaml diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index ee92e4e..d09785d 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -33,5 +33,5 @@ jobs: - name: Deploy container run: | - docker compose -f docker-compose-api.prod.yaml pull agologum-api - docker compose -f docker-compose-api.prod.yaml up -d --force-recreate agologum-api + docker compose -f ./api/docker-compose.prod.yaml pull agologum-api + docker compose -f ./api/docker-compose.prod.yaml up -d --force-recreate agologum-api diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index a946d65..31f1c7f 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -33,5 +33,5 @@ jobs: - name: Deploy run: | - docker compose -f docker-compose-client.prod.yaml pull agologum-client - docker compose -f docker-compose-client.prod.yaml up -d --force-recreate agologum-client + docker compose -f ./client/docker-compose.prod.yaml pull agologum-client + docker compose -f ./client/docker-compose.prod.yaml up -d --force-recreate agologum-client diff --git a/api/Program.cs b/api/Program.cs index 750db85..c56985d 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -2,6 +2,8 @@ using Microsoft.AspNetCore.HttpOverrides; var builder = WebApplication.CreateBuilder(args); + +// configuration for behind my nginx proxy builder.Services.Configure(options => { options.ForwardedHeaders = diff --git a/docker-compose-api.prod.yaml b/docker-compose-api.prod.yaml deleted file mode 100644 index 17d2751..0000000 --- a/docker-compose-api.prod.yaml +++ /dev/null @@ -1,8 +0,0 @@ - -services: - agologum-api: - image: git.vxbard.net/homeburger/agologum-api:latest - container_name: agologum-api - restart: always - ports: - - "5000:5000" diff --git a/docker-compose-client.prod.yaml b/docker-compose-client.prod.yaml deleted file mode 100644 index 7cf6298..0000000 --- a/docker-compose-client.prod.yaml +++ /dev/null @@ -1,9 +0,0 @@ - -services: - agologum-client: - image: git.vxbard.net/homeburger/agologum-client:latest - container_name: agologum-client - restart: always - ports: - - "8080:80" - \ No newline at end of file From 509f1d43b18ab672b976d59f3fe169cc4aea0d93 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:11:03 -0600 Subject: [PATCH 47/53] add those files actually oops --- api/docker-compose.prod.yaml | 8 ++++++++ client/docker-compose.prod.yaml | 9 +++++++++ 2 files changed, 17 insertions(+) create mode 100644 api/docker-compose.prod.yaml create mode 100644 client/docker-compose.prod.yaml diff --git a/api/docker-compose.prod.yaml b/api/docker-compose.prod.yaml new file mode 100644 index 0000000..17d2751 --- /dev/null +++ b/api/docker-compose.prod.yaml @@ -0,0 +1,8 @@ + +services: + agologum-api: + image: git.vxbard.net/homeburger/agologum-api:latest + container_name: agologum-api + restart: always + ports: + - "5000:5000" diff --git a/client/docker-compose.prod.yaml b/client/docker-compose.prod.yaml new file mode 100644 index 0000000..7cf6298 --- /dev/null +++ b/client/docker-compose.prod.yaml @@ -0,0 +1,9 @@ + +services: + agologum-client: + image: git.vxbard.net/homeburger/agologum-client:latest + container_name: agologum-client + restart: always + ports: + - "8080:80" + \ No newline at end of file From 6ffb3e2e396f0ac2b468f87771de2ca256177bf5 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:17:21 -0600 Subject: [PATCH 48/53] different job names --- .gitea/workflows/deploy-api.yaml | 4 ++++ .gitea/workflows/deploy-client.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index d09785d..abe01d2 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -1,11 +1,15 @@ name: Build and Deploy API +run-name: "${CI_COMMIT_REF_NAME}: Deploy API" + on: push: branches: - main - feature/ci-cd + paths: + - "api/**" jobs: build-and-deploy: diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 31f1c7f..40a4ff9 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -1,11 +1,15 @@ name: Build and Deploy Frontend +run-name: "${CI_COMMIT_REF_NAME}: Deploy Client" + on: push: branches: - main - feature/ci-cd + paths: + - "client/**" jobs: build-and-deploy: From 6e36831db478da184be295bb218daf99edc8faa4 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:18:14 -0600 Subject: [PATCH 49/53] actually run on pipeline changes --- .gitea/workflows/deploy-api.yaml | 1 + .gitea/workflows/deploy-client.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index abe01d2..907e1ab 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -10,6 +10,7 @@ on: - feature/ci-cd paths: - "api/**" + - ".gitea/workflows/deploy-api.yaml" jobs: build-and-deploy: diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 40a4ff9..56b1f63 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -10,6 +10,7 @@ on: - feature/ci-cd paths: - "client/**" + - ".gitea/workflows/deploy-client.yaml" jobs: build-and-deploy: From 51766a0a5b846bd7ab80123161136f37887f4f74 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:19:12 -0600 Subject: [PATCH 50/53] real job name this time :3 --- .gitea/workflows/deploy-api.yaml | 2 +- .gitea/workflows/deploy-client.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 907e1ab..30d92a4 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -1,7 +1,7 @@ name: Build and Deploy API -run-name: "${CI_COMMIT_REF_NAME}: Deploy API" +run-name: "${{ gitea.event.head_commit.message }}: Deploy API" on: push: diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 56b1f63..981f30e 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -1,7 +1,7 @@ name: Build and Deploy Frontend -run-name: "${CI_COMMIT_REF_NAME}: Deploy Client" +run-name: "${{ gitea.event.head_commit.message }}: Deploy Client" on: push: From 675595b248caaa9c42e9547c69bc0abb5538c4ec Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:25:19 -0600 Subject: [PATCH 51/53] comments --- .gitea/workflows/deploy-api.yaml | 1 + .gitea/workflows/deploy-client.yaml | 1 + api/Program.cs | 2 ++ 3 files changed, 4 insertions(+) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 30d92a4..010c24f 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -22,6 +22,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 + # needs this in order to push to the registry - name: Validate Registry run: | echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.vxbard.net \ diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 981f30e..5abff92 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -22,6 +22,7 @@ jobs: - name: Checkout code uses: actions/checkout@v3 + # needs this in order to push to the registry - name: Validate Registry run: | echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.vxbard.net \ diff --git a/api/Program.cs b/api/Program.cs index c56985d..36d8d30 100644 --- a/api/Program.cs +++ b/api/Program.cs @@ -30,6 +30,8 @@ if (app.Environment.IsDevelopment()) app.UseHttpsRedirection(); + +// below is a placeholder endpoint var summaries = new[] { "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" From 92f3e1e4425601f141e447981ae0bf8d88259ba7 Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 20:26:11 -0600 Subject: [PATCH 52/53] placeholder --- client/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/index.html b/client/index.html index 9e5fc8f..47d0385 100644 --- a/client/index.html +++ b/client/index.html @@ -4,7 +4,7 @@ - Vite App + homeburger place
From 4a3c1dfa3958bbbf8ae52c217ab2116e9bf9033c Mon Sep 17 00:00:00 2001 From: Blitblank Date: Sat, 28 Feb 2026 23:02:45 -0600 Subject: [PATCH 53/53] remove testing lines in ci/cd --- .gitea/workflows/deploy-api.yaml | 1 - .gitea/workflows/deploy-client.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index 010c24f..bff3cdb 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -7,7 +7,6 @@ on: push: branches: - main - - feature/ci-cd paths: - "api/**" - ".gitea/workflows/deploy-api.yaml" diff --git a/.gitea/workflows/deploy-client.yaml b/.gitea/workflows/deploy-client.yaml index 5abff92..1b435a7 100644 --- a/.gitea/workflows/deploy-client.yaml +++ b/.gitea/workflows/deploy-client.yaml @@ -7,7 +7,6 @@ on: push: branches: - main - - feature/ci-cd paths: - "client/**" - ".gitea/workflows/deploy-client.yaml"