Skip to content

Commit 71257dd

Browse files
yassinswsyassinsws
authored
Merge pull request #40 from AET-DevOps25/feature/docker-cleanup
Feature/docker cleanup
2 parents 2ade7eb + e5f7661 commit 71257dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+538
-2103
lines changed

‎.env.dev‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Postgres
2+
POSTGRES_USER=postgres
3+
POSTGRES_PASSWORD=postgres
4+
POSTGRES_DB=postgres
5+
POSTGRES_MULTIPLE_DATABASES=auth_db,document_db
6+
7+
# Spring Auth/Document Services
8+
SPRING_DATASOURCE_USERNAME=postgres
9+
SPRING_DATASOURCE_PASSWORD=postgres
10+
SPRING_DATASOURCE_URL_AUTH=jdbc:postgresql://postgres:5432/auth_db
11+
SPRING_DATASOURCE_URL_DOCUMENT=jdbc:postgresql://postgres:5432/document_db
12+
13+
# GenAI service
14+
GENAI_BACKEND_URL=http://genai:8081
15+
DOCUMENT_SERVICE_URL=http://document-service:8084
16+
17+
# GenAI container
18+
WEAVIATE_HOST=weaviate
19+
WEAVIATE_PORT=8090
20+
OPEN_WEBUI_API_KEY_CHAT=dummy-key-chat
21+
OPEN_WEBUI_API_KEY_GEN=dummy-key-gen
22+
LANGSMITH_TRACING=true
23+
LANGSMITH_ENDPOINT=https://api.smith.langchain.com
24+
LANGSMITH_API_KEY=dummy-langsmith-key
25+
LANGSMITH_PROJECT=studymate
26+
27+
# Grafana
28+
GF_SECURITY_ADMIN_USER=admin
29+
GF_SECURITY_ADMIN_PASSWORD=admin
30+
31+
# Client
32+
VITE_API_BASE_URL=http://localhost:8888

‎.github/workflows/build-images.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,41 @@ jobs:
5151
docker push ghcr.io/aet-devops25/team-3/auth-service:${COMMIT_SHA}
5252
docker tag ghcr.io/aet-devops25/team-3/auth-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/auth-service:latest
5353
docker push ghcr.io/aet-devops25/team-3/auth-service:latest
54+
docker tag ghcr.io/aet-devops25/team-3/auth-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/auth-service:k8s-latest
55+
docker push ghcr.io/aet-devops25/team-3/auth-service:k8s-latest
5456
5557
- name: Build and push document-service
5658
run: |
5759
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/document-service:${COMMIT_SHA} ./server/document-service
5860
docker push ghcr.io/aet-devops25/team-3/document-service:${COMMIT_SHA}
5961
docker tag ghcr.io/aet-devops25/team-3/document-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/document-service:latest
6062
docker push ghcr.io/aet-devops25/team-3/document-service:latest
63+
docker tag ghcr.io/aet-devops25/team-3/document-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/document-service:k8s-latest
64+
docker push ghcr.io/aet-devops25/team-3/document-service:k8s-latest
6165
6266
- name: Build and push genai-service
6367
run: |
6468
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/genai-service:${COMMIT_SHA} ./server/genai-service
6569
docker push ghcr.io/aet-devops25/team-3/genai-service:${COMMIT_SHA}
6670
docker tag ghcr.io/aet-devops25/team-3/genai-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/genai-service:latest
6771
docker push ghcr.io/aet-devops25/team-3/genai-service:latest
72+
docker tag ghcr.io/aet-devops25/team-3/genai-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/genai-service:k8s-latest
73+
docker push ghcr.io/aet-devops25/team-3/genai-service:k8s-latest
6874
6975
- name: Build and push eureka-server
7076
run: |
7177
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/eureka-server:${COMMIT_SHA} ./server/eureka-server
7278
docker push ghcr.io/aet-devops25/team-3/eureka-server:${COMMIT_SHA}
7379
docker tag ghcr.io/aet-devops25/team-3/eureka-server:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/eureka-server:latest
7480
docker push ghcr.io/aet-devops25/team-3/eureka-server:latest
81+
docker tag ghcr.io/aet-devops25/team-3/eureka-server:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/eureka-server:k8s-latest
82+
docker push ghcr.io/aet-devops25/team-3/eureka-server:k8s-latest
7583
7684
- name: Build and push genai
7785
run: |
78-
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA} ./genAi
86+
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA} ./genai
7987
docker push ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA}
8088
docker tag ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/genai:latest
81-
docker push ghcr.io/aet-devops25/team-3/genai:latest
89+
docker push ghcr.io/aet-devops25/team-3/genai:latest
90+
docker tag ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/genai:k8s-latest
91+
docker push ghcr.io/aet-devops25/team-3/genai:k8s-latest

‎.github/workflows/build-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
6262
- name: Build genai (validation only)
6363
run: |
64-
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA} ./genAi
64+
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA} ./genai
6565
echo "✅ GenAI build successful"
6666
6767
- name: Validation Summary

‎.github/workflows/deploy-genai-backend.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches: [main]
66
paths:
7-
- 'genAi/**'
7+
- 'genai/**'
88
- 'infra/helm-charts/genai-backend/**'
99
- '.github/workflows/deploy-genai-backend.yml'
1010
pull_request:
1111
types: [opened, synchronize, reopened]
1212
paths:
13-
- 'genAi/**'
13+
- 'genai/**'
1414
- 'infra/helm-charts/genai-backend/**'
1515
- '.github/workflows/deploy-genai-backend.yml'
1616
workflow_dispatch:
@@ -37,19 +37,19 @@ jobs:
3737
uses: actions/cache@v3
3838
with:
3939
path: ~/.cache/pip
40-
key: ${{ runner.os }}-pip-${{ hashFiles('genAi/requirements.txt') }}
40+
key: ${{ runner.os }}-pip-${{ hashFiles('genai/requirements.txt') }}
4141
restore-keys: |
4242
${{ runner.os }}-pip-
4343
4444
- name: Install dependencies
4545
run: |
46-
cd genAi
46+
cd genai
4747
pip install -r requirements.txt
4848
echo "✅ Dependencies installed successfully"
4949
5050
- name: Build Docker Image
5151
run: |
52-
cd genAi
52+
cd genai
5353
docker build -t ghcr.io/aet-devops25/team-3/genai:${{ github.event.inputs.image_tag || github.sha }} .
5454
docker build -t ghcr.io/aet-devops25/team-3/genai:latest .
5555
echo "✅ Docker image built successfully"
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Push Docker Image
6565
run: |
66-
cd genAi
66+
cd genai
6767
docker push ghcr.io/aet-devops25/team-3/genai:${{ github.event.inputs.image_tag || github.sha }}
6868
docker push ghcr.io/aet-devops25/team-3/genai:latest
6969
echo "✅ Docker image pushed successfully"

‎.github/workflows/deploy_aws.yml‎

Lines changed: 1 addition & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -7,92 +7,7 @@ on:
77

88

99
jobs:
10-
build-and-push:
11-
runs-on: ubuntu-latest
12-
permissions:
13-
contents: read
14-
packages: write
15-
16-
env:
17-
COMMIT_SHA: ${{ github.sha }}
18-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
19-
GITHUB_ACTOR: ${{ github.actor }}
20-
21-
steps:
22-
- name: Checkout code
23-
uses: actions/checkout@v4
24-
25-
- name: Login to GitHub Container Registry
26-
uses: docker/login-action@v3
27-
with:
28-
registry: ghcr.io
29-
username: ${{ github.actor }}
30-
password: ${{ secrets.GITHUB_TOKEN }}
31-
32-
# Build and Push Microservices (using multi-stage Docker builds)
33-
- name: Build and push auth-service
34-
run: |
35-
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/auth-service:${COMMIT_SHA} ./server/auth-service
36-
docker push ghcr.io/aet-devops25/team-3/auth-service:${COMMIT_SHA}
37-
38-
- name: Build and push document-service
39-
run: |
40-
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/document-service:${COMMIT_SHA} ./server/document-service
41-
docker push ghcr.io/aet-devops25/team-3/document-service:${COMMIT_SHA}
42-
43-
- name: Build and push genai-service
44-
run: |
45-
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/genai-service:${COMMIT_SHA} ./server/genai-service
46-
docker push ghcr.io/aet-devops25/team-3/genai-service:${COMMIT_SHA}
47-
48-
- name: Build and push eureka-server
49-
run: |
50-
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/eureka-server:${COMMIT_SHA} ./server/eureka-server
51-
docker push ghcr.io/aet-devops25/team-3/eureka-server:${COMMIT_SHA}
52-
53-
- name: Build and push client for EC2
54-
run: |
55-
docker build --platform linux/amd64 --build-arg VITE_API_BASE_URL=https://studymate-tum.xyz -t ghcr.io/aet-devops25/team-3/client:ec2-${COMMIT_SHA} ./client
56-
docker push ghcr.io/aet-devops25/team-3/client:ec2-${COMMIT_SHA}
57-
58-
- name: Build and push genai
59-
run: |
60-
docker build --platform linux/amd64 -t ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA} ./genAi
61-
docker push ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA}
62-
63-
# Tag and push as latest
64-
- name: Tag and push auth-service as latest
65-
run: |
66-
docker tag ghcr.io/aet-devops25/team-3/auth-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/auth-service:latest
67-
docker push ghcr.io/aet-devops25/team-3/auth-service:latest
68-
69-
- name: Tag and push document-service as latest
70-
run: |
71-
docker tag ghcr.io/aet-devops25/team-3/document-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/document-service:latest
72-
docker push ghcr.io/aet-devops25/team-3/document-service:latest
73-
74-
- name: Tag and push genai-service as latest
75-
run: |
76-
docker tag ghcr.io/aet-devops25/team-3/genai-service:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/genai-service:latest
77-
docker push ghcr.io/aet-devops25/team-3/genai-service:latest
78-
79-
- name: Tag and push eureka-server as latest
80-
run: |
81-
docker tag ghcr.io/aet-devops25/team-3/eureka-server:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/eureka-server:latest
82-
docker push ghcr.io/aet-devops25/team-3/eureka-server:latest
83-
84-
- name: Tag and push client as ec2-latest
85-
run: |
86-
docker tag ghcr.io/aet-devops25/team-3/client:ec2-${COMMIT_SHA} ghcr.io/aet-devops25/team-3/client:ec2-latest
87-
docker push ghcr.io/aet-devops25/team-3/client:ec2-latest
88-
89-
- name: Tag and push genai as latest
90-
run: |
91-
docker tag ghcr.io/aet-devops25/team-3/genai:${COMMIT_SHA} ghcr.io/aet-devops25/team-3/genai:latest
92-
docker push ghcr.io/aet-devops25/team-3/genai:latest
93-
9410
deploy-aws:
95-
needs: build-and-push
9611
runs-on: ubuntu-latest
9712
env:
9813
COMMIT_SHA: ${{ github.sha }}
@@ -124,4 +39,5 @@ jobs:
12439
LANGSMITH_API_KEY: ${{ secrets.LANGSMITH_API_KEY }}
12540
GRAFANA_ADMIN_USERNAME: ${{ secrets.GRAFANA_ADMIN_USERNAME }}
12641
GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
42+
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
12743
run: ansible-playbook -i inventory.ini ansible/deploy.yml

0 commit comments

Comments
 (0)