Skip to content

Commit fb9d156

Browse files
a-klosa-klos
authored
Merge branch 'main' into deps-main
2 parents 98e821f + 3fb27d9 commit fb9d156

3 files changed

Lines changed: 12 additions & 53 deletions

File tree

‎.github/workflows/semantic-release.yml‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -79,46 +79,6 @@ jobs:
7979
echo "ℹ️ No new release published"
8080
fi
8181
82-
- name: update-helm-values
83-
if: steps.semantic-release.outputs.new-release-published == 'true'
84-
run: |
85-
echo "🔍 Debug: new-release-published = ${{ steps.semantic-release.outputs.new-release-published }}"
86-
echo "🔍 Debug: new-release-version = ${{ steps.semantic-release.outputs.new-release-version }}"
87-
88-
NEW_VERSION="${{ steps.semantic-release.outputs.new-release-version }}"
89-
VALUES_FILE="infrastructure/rag/values.yaml"
90-
91-
# Update Helm values using Python script
92-
pip install ruamel.yaml
93-
python3 tools/update-helm-values.py "$NEW_VERSION"
94-
95-
# Show git diff for verification
96-
if ! git diff --quiet "$VALUES_FILE"; then
97-
echo "Changes made to values.yaml:"
98-
git diff "$VALUES_FILE"
99-
else
100-
echo "⚠️ No changes detected in values.yaml"
101-
fi
102-
103-
- name: commit-helm-changes
104-
if: steps.semantic-release.outputs.new-release-published == 'true'
105-
run: |
106-
# Check if there are changes to commit
107-
if ! git diff --quiet infrastructure/rag/values.yaml; then
108-
echo "📝 Committing Helm values changes..."
109-
git config --local user.email "action@github.com"
110-
git config --local user.name "GitHub Action"
111-
git add infrastructure/rag/values.yaml
112-
113-
# Create a new commit for the Helm changes (don't amend since semantic-release already pushed)
114-
git commit -m "chore: update helm chart image tags to v${{ steps.semantic-release.outputs.new-release-version }}"
115-
git push
116-
117-
echo "✅ Helm chart changes committed and pushed"
118-
else
119-
echo "ℹ️ No Helm chart changes to commit"
120-
fi
121-
12282
build-and-push-images:
12383
name: build-and-push-images
12484
runs-on: ubuntu-latest
@@ -194,4 +154,3 @@ jobs:
194154
echo "- frontend" >> $GITHUB_STEP_SUMMARY
195155
echo "- admin-frontend" >> $GITHUB_STEP_SUMMARY
196156
echo "**Registry:** ghcr.io/${{ github.repository_owner }}/rag-template" >> $GITHUB_STEP_SUMMARY
197-
echo "**Helm chart updated:** infrastructure/rag/values.yaml" >> $GITHUB_STEP_SUMMARY

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ IMAGE_TAG?=v1.0.0
2222
REGISTRY?=
2323

2424
build_and_push:
25-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/rag-backend:$(IMAGE_TAG) -f services/rag-backend/Dockerfile --push .
26-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-backend:$(IMAGE_TAG) -f services/admin-backend/Dockerfile --push .
27-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/document-extractor:$(IMAGE_TAG) -f services/document-extractor/Dockerfile --push .
28-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/frontend:$(IMAGE_TAG) -f services/frontend/apps/chat-app/Dockerfile --push .
29-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-frontend:$(IMAGE_TAG) -f services/frontend/apps/admin-app/Dockerfile --push .
30-
docker buildx build --platform linux/amd64 -t $(REGISTRY)/mcp-server:$(IMAGE_TAG) -f services/mcp-server/Dockerfile --push .
25+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/rag-backend:$(IMAGE_TAG) -t $(REGISTRY)/rag-backend:latest -f services/rag-backend/Dockerfile --push .
26+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-backend:$(IMAGE_TAG) -t $(REGISTRY)/admin-backend:latest -f services/admin-backend/Dockerfile --push .
27+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/document-extractor:$(IMAGE_TAG) -t $(REGISTRY)/document-extractor:latest -f services/document-extractor/Dockerfile --push .
28+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/frontend:$(IMAGE_TAG) -t $(REGISTRY)/frontend:latest -f services/frontend/apps/chat-app/Dockerfile --push .
29+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-frontend:$(IMAGE_TAG) -t $(REGISTRY)/admin-frontend:latest -f services/frontend/apps/admin-app/Dockerfile --push .
30+
docker buildx build --platform linux/amd64 -t $(REGISTRY)/mcp-server:$(IMAGE_TAG) -t $(REGISTRY)/mcp-server:latest -f services/mcp-server/Dockerfile --push .

‎infrastructure/rag/values.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ backend:
7070
image:
7171
repository: ghcr.io/stackitcloud/rag-template/mcp-server
7272
pullPolicy: Always
73-
tag: "v2.1.0"
73+
tag: "latest"
7474

7575
name: backend
7676
replicaCount: 1
7777

7878
image:
7979
repository: ghcr.io/stackitcloud/rag-template/rag-backend
8080
pullPolicy: Always
81-
tag: "v2.1.0"
81+
tag: "latest"
8282

8383
command:
8484
- "poetry"
@@ -216,7 +216,7 @@ frontend:
216216
image:
217217
repository: ghcr.io/stackitcloud/rag-template/frontend
218218
pullPolicy: Always
219-
tag: "v2.1.0"
219+
tag: "latest"
220220

221221
service:
222222
type: ClusterIP
@@ -251,7 +251,7 @@ adminBackend:
251251
image:
252252
repository: ghcr.io/stackitcloud/rag-template/admin-backend
253253
pullPolicy: Always
254-
tag: "v2.1.0"
254+
tag: "latest"
255255

256256
command:
257257
- "poetry"
@@ -331,7 +331,7 @@ extractor:
331331
image:
332332
repository: ghcr.io/stackitcloud/rag-template/document-extractor
333333
pullPolicy: Always
334-
tag: "v2.1.0"
334+
tag: "latest"
335335

336336
command:
337337
- "poetry"
@@ -379,7 +379,7 @@ adminFrontend:
379379
image:
380380
repository: ghcr.io/stackitcloud/rag-template/admin-frontend
381381
pullPolicy: Always
382-
tag: "v2.1.0"
382+
tag: "latest"
383383

384384
service:
385385
type: ClusterIP

0 commit comments

Comments
 (0)