Skip to content

Commit 2a714fb

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/opentelemetry/instrumentation-ioredis-0.66.0
2 parents d81d49d + 6abec6f commit 2a714fb

38 files changed

Lines changed: 1749 additions & 1166 deletions

File tree

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ coverage
2222
.DS_Store
2323
.kiro
2424
scripts
25-
logs
25+
/logs

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
node-version: ${{ env.NODE_VERSION }}
7676

7777
- name: Install pnpm
78-
uses: pnpm/action-setup@v4
78+
uses: pnpm/action-setup@v6
7979
with:
8080
version: ${{ env.PNPM_VERSION }}
8181

@@ -122,7 +122,7 @@ jobs:
122122
node-version: ${{ env.NODE_VERSION }}
123123

124124
- name: Install pnpm
125-
uses: pnpm/action-setup@v4
125+
uses: pnpm/action-setup@v6
126126
with:
127127
version: ${{ env.PNPM_VERSION }}
128128

@@ -205,7 +205,7 @@ jobs:
205205
node-version: ${{ env.NODE_VERSION }}
206206

207207
- name: Install pnpm
208-
uses: pnpm/action-setup@v4
208+
uses: pnpm/action-setup@v6
209209
with:
210210
version: ${{ env.PNPM_VERSION }}
211211

@@ -312,7 +312,7 @@ jobs:
312312
node-version: ${{ env.NODE_VERSION }}
313313

314314
- name: Install pnpm
315-
uses: pnpm/action-setup@v4
315+
uses: pnpm/action-setup@v6
316316
with:
317317
version: ${{ env.PNPM_VERSION }}
318318

@@ -377,7 +377,7 @@ jobs:
377377
node-version: ${{ env.NODE_VERSION }}
378378

379379
- name: Install pnpm
380-
uses: pnpm/action-setup@v4
380+
uses: pnpm/action-setup@v6
381381
with:
382382
version: ${{ env.PNPM_VERSION }}
383383

.github/workflows/docker.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ jobs:
186186
uses: actions/checkout@v6
187187

188188
- name: Set up QEMU
189-
uses: docker/setup-qemu-action@v3
189+
uses: docker/setup-qemu-action@v4
190190

191191
- name: Set up Docker Buildx
192192
uses: docker/setup-buildx-action@v3
@@ -200,7 +200,7 @@ jobs:
200200
password: ${{ secrets.DOCKERHUB_TOKEN }}
201201

202202
- name: Build and push backend
203-
uses: docker/build-push-action@v6
203+
uses: docker/build-push-action@v7
204204
with:
205205
context: .
206206
file: ./Dockerfile.backend
@@ -234,7 +234,7 @@ jobs:
234234
uses: actions/checkout@v6
235235

236236
- name: Set up QEMU
237-
uses: docker/setup-qemu-action@v3
237+
uses: docker/setup-qemu-action@v4
238238

239239
- name: Set up Docker Buildx
240240
uses: docker/setup-buildx-action@v3
@@ -248,7 +248,7 @@ jobs:
248248
password: ${{ secrets.DOCKERHUB_TOKEN }}
249249

250250
- name: Build and push frontend
251-
uses: docker/build-push-action@v6
251+
uses: docker/build-push-action@v7
252252
with:
253253
context: .
254254
file: ./Dockerfile.frontend

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
uses: actions/checkout@v6
9191

9292
- name: Set up QEMU
93-
uses: docker/setup-qemu-action@v3
93+
uses: docker/setup-qemu-action@v4
9494

9595
- name: Set up Docker Buildx
9696
uses: docker/setup-buildx-action@v3
@@ -115,8 +115,8 @@ jobs:
115115
uses: docker/metadata-action@v5
116116
with:
117117
images: |
118-
${{ env.REGISTRY_DOCKER }}/${{ env.IMAGE_NAME }}
119-
${{ env.GHCR_IMAGE_NAME }}
118+
${{ env.REGISTRY_DOCKER }}/${{ env.IMAGE_BACKEND }}
119+
${{ env.GHCR_IMAGE_BACKEND }}
120120
flavor: |
121121
latest=false
122122
tags: |
@@ -135,7 +135,7 @@ jobs:
135135
io.telemetryflow.component=core-monorepo
136136
137137
- name: Build and push Docker images
138-
uses: docker/build-push-action@v6
138+
uses: docker/build-push-action@v7
139139
with:
140140
context: .
141141
platforms: linux/amd64,linux/arm64
@@ -171,7 +171,7 @@ jobs:
171171
node-version: ${{ env.NODE_VERSION }}
172172

173173
- name: Install pnpm
174-
uses: pnpm/action-setup@v4
174+
uses: pnpm/action-setup@v6
175175
with:
176176
version: ${{ env.PNPM_VERSION }}
177177

@@ -279,7 +279,7 @@ jobs:
279279
fi
280280
281281
- name: Create Release
282-
uses: softprops/action-gh-release@v2
282+
uses: softprops/action-gh-release@v3
283283
with:
284284
name: "${{ env.PRODUCT_NAME }} v${{ needs.prepare.outputs.version }}"
285285
tag_name: "v${{ needs.prepare.outputs.version }}"

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ frontend/node_modules
88
.turbo
99

1010
# Logs
11-
logs
11+
/logs
1212
*.log
1313
npm-debug.log*
1414
pnpm-debug.log*
@@ -43,9 +43,10 @@ frontend/coverage
4343

4444
# Environment
4545
.env
46+
/.env
47+
.env-*
4648
!.env.example
47-
backend/.env
48-
frontend/.env
49+
!.env.example-*
4950

5051
# Temp
5152
temp/

.kiro/.DS_Store

-6 KB
Binary file not shown.

.kiro/specs/.DS_Store

-8 KB
Binary file not shown.

Dockerfile.frontend

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ RUN npm install -g pnpm@10.24.0
1919
# Copy workspace configuration files (required for pnpm workspace)
2020
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml turbo.json ./
2121

22-
# Copy frontend source code and nest-cli config
22+
# Copy backend/package.json for pnpm workspace resolution
23+
COPY backend/package.json ./backend/package.json
24+
25+
# Copy frontend source code
2326
COPY frontend/ ./frontend/
2427

2528
# Install all dependencies (workspace-aware)
@@ -57,7 +60,7 @@ RUN pnpm build:frontend
5760
# -----------------------------------------------------------------------------
5861
# Stage 2: Production
5962
# -----------------------------------------------------------------------------
60-
FROM nginx:1.27-alpine AS production
63+
FROM nginx:1.31-alpine AS production
6164

6265
# Update packages to get security patches (CVE fixes)
6366
RUN apk upgrade --no-cache

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ telemetryflow-core/
4747
│ │ ├── alerting/ # Alert Rules Engine
4848
│ │ ├── query/ # TFQL Query Engine
4949
│ │ ├── llm/ # AI Assistant (LLM Integration)
50-
│ │ ├── retention/ # Data Retention Policies
50+
│ │ ├── retention/ # Data Retention Policies
5151
│ │ ├── notification/ # Notification Service
5252
│ │ ├── data-masking/ # Data Masking Policies
5353
│ │ └── cache/ # Caching Service

0 commit comments

Comments
 (0)