Skip to content

Commit edee6d7

Browse files
EnricoBausenhartEnricoBausenhart
committed
remove debug
1 parent f3ba0be commit edee6d7

File tree

2 files changed

+60
-103
lines changed

2 files changed

+60
-103
lines changed

‎.github/workflows/deploy-aws.yml‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -64,44 +64,5 @@ jobs:
6464
key: ${{ secrets.AWS_EC2_PRIVATE_KEY }}
6565
script: |
6666
cd /home/${{ vars.AWS_EC2_USER }}
67-
echo "Current directory: $(pwd)"
68-
echo "Listing files in current directory:"
69-
ls -la
70-
echo "Checking .env.prod file:"
71-
cat .env.prod
72-
echo "Logging into Docker registry..."
73-
# Versuche zuerst einen Test-Pull für client
74-
docker pull ghcr.io/aet-devops25/team-devoops/client:latest || echo "Initial client pull failed (expected)"
75-
# Versuche einen Test-Pull für gateway
76-
docker pull ghcr.io/aet-devops25/team-devoops/server/gateway:latest || echo "Initial gateway pull failed (expected)"
77-
# Login mit Debug-Output
7867
echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
79-
# Warte kurz
80-
sleep 2
81-
# Überprüfe Repository-Zugriff
82-
echo "Checking repository access..."
83-
curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/user/packages?package_type=container
84-
echo "Checking specific repository..."
85-
curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://api.github.com/users/aet-devops25/packages?package_type=container
86-
# Liste verfügbare Images
87-
echo "Listing available images..."
88-
curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" https://ghcr.io/v2/aet-devops25/team-devoops/tags/list
89-
# Versuche erneut zu pullen
90-
echo "Testing pull after login..."
91-
docker pull ghcr.io/aet-devops25/team-devoops/client:latest
92-
echo "Testing gateway pull after login..."
93-
docker pull ghcr.io/aet-devops25/team-devoops/server/gateway:latest
94-
echo "Testing chat pull after login..."
95-
docker pull ghcr.io/aet-devops25/team-devoops/server/chat:latest
96-
echo "Testing matching pull after login..."
97-
docker pull ghcr.io/aet-devops25/team-devoops/server/matching:latest
98-
echo "Testing user pull after login..."
99-
docker pull ghcr.io/aet-devops25/team-devoops/server/user:latest
100-
echo "Testing genai pull after login..."
101-
docker pull ghcr.io/aet-devops25/team-devoops/server/genai:latest
102-
echo "Starting Docker Compose..."
103-
# Zeige Docker Compose Konfiguration
104-
echo "Docker Compose configuration:"
105-
docker compose -f deployment/compose.aws.yml --env-file=/home/${{ vars.AWS_EC2_USER }}/.env.prod config
106-
# Starte mit Debug-Output
107-
DOCKER_BUILDKIT=0 docker compose -f deployment/compose.aws.yml --env-file=/home/${{ vars.AWS_EC2_USER }}/.env.prod up --pull=always -d
68+
docker compose -f deployment/compose.aws.yml up -d

‎deployment/compose.aws.yml‎

Lines changed: 59 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -22,88 +22,84 @@ services:
2222
networks:
2323
- backend
2424

25+
client:
26+
image: ghcr.io/aet-devops25/team-devoops/client:latest
27+
environment:
28+
- PUBLIC_API_URL=https://api.${EC2_PUBLIC_IP}.nip.io
29+
labels:
30+
- traefik.enable=true
31+
- traefik.http.routers.client.entrypoints=websecure
32+
- traefik.http.routers.client.rule=Host(`client.${EC2_PUBLIC_IP}.nip.io`)
33+
- traefik.http.routers.client.tls.certresolver=letsencrypt
34+
- traefik.http.services.client.loadbalancer.server.port=80
35+
- traefik.http.middlewares.client-compress.compress=true
36+
- traefik.http.routers.client.middlewares=client-compress
37+
- traefik.http.routers.client.priority=1
38+
depends_on:
39+
gateway-service:
40+
condition: service_started
41+
required: true
42+
restart: unless-stopped
43+
2544
gateway-service:
26-
image: ${GATEWAY_IMAGE}
45+
image: ghcr.io/aet-devops25/team-devoops/server/gateway:latest
2746
container_name: gateway-service
28-
depends_on:
29-
- chat-service
30-
- matching-service
31-
- user-service
32-
networks:
33-
- backend
3447
labels:
35-
- "traefik.enable=true"
36-
- "traefik.http.routers.gateway.rule=Host(`${SERVER_HOST}`)"
37-
- "traefik.http.services.gateway.loadbalancer.server.port=8080"
38-
- "traefik.http.routers.gateway.entrypoints=websecure"
39-
- "traefik.http.routers.gateway.tls.certresolver=letsencrypt"
48+
- traefik.enable=true
49+
- traefik.http.routers.gateway.entrypoints=websecure
50+
- traefik.http.routers.gateway.rule=Host(`api.${EC2_PUBLIC_IP}.nip.io`)
51+
- traefik.http.routers.gateway.tls.certresolver=letsencrypt
52+
- traefik.http.services.gateway.loadbalancer.server.port=8080
53+
depends_on:
54+
chat-service:
55+
condition: service_started
56+
required: true
57+
matching-service:
58+
condition: service_started
59+
required: true
60+
user-service:
61+
condition: service_started
62+
required: true
4063

4164
chat-service:
42-
image: ${CHAT_IMAGE}
65+
image: ghcr.io/aet-devops25/team-devoops/server/chat:latest
4366
container_name: chat-service
44-
networks:
45-
- backend
4667
labels:
47-
- "traefik.enable=true"
48-
- "traefik.http.routers.chat.rule=Host(`${SERVER_HOST}`) && PathPrefix(`/chat`)"
49-
- "traefik.http.services.chat.loadbalancer.server.port=80"
50-
- "traefik.http.routers.chat.entrypoints=websecure"
51-
- "traefik.http.routers.chat.tls.certresolver=letsencrypt"
68+
- traefik.enable=true
69+
- traefik.http.routers.chat.entrypoints=websecure
70+
- traefik.http.routers.chat.rule=Host(`api.${EC2_PUBLIC_IP}.nip.io`) && PathPrefix(`/chat`)
71+
- traefik.http.routers.chat.tls.certresolver=letsencrypt
72+
- traefik.http.services.chat.loadbalancer.server.port=80
5273

5374
matching-service:
54-
image: ${MATCHING_IMAGE}
75+
image: ghcr.io/aet-devops25/team-devoops/server/matching:latest
5576
container_name: matching-service
56-
networks:
57-
- backend
5877
labels:
59-
- "traefik.enable=true"
60-
- "traefik.http.routers.matching.rule=Host(`${SERVER_HOST}`) && PathPrefix(`/matching`)"
61-
- "traefik.http.services.matching.loadbalancer.server.port=80"
62-
- "traefik.http.routers.matching.entrypoints=websecure"
63-
- "traefik.http.routers.matching.tls.certresolver=letsencrypt"
78+
- traefik.enable=true
79+
- traefik.http.routers.matching.entrypoints=websecure
80+
- traefik.http.routers.matching.rule=Host(`api.${EC2_PUBLIC_IP}.nip.io`) && PathPrefix(`/matching`)
81+
- traefik.http.routers.matching.tls.certresolver=letsencrypt
82+
- traefik.http.services.matching.loadbalancer.server.port=80
6483

6584
user-service:
66-
image: ${USER_IMAGE}
85+
image: ghcr.io/aet-devops25/team-devoops/server/user:latest
6786
container_name: user-service
68-
networks:
69-
- backend
7087
labels:
71-
- "traefik.enable=true"
72-
- "traefik.http.routers.user.rule=Host(`${SERVER_HOST}`) && PathPrefix(`/user`)"
73-
- "traefik.http.services.user.loadbalancer.server.port=80"
74-
- "traefik.http.routers.user.entrypoints=websecure"
75-
- "traefik.http.routers.user.tls.certresolver=letsencrypt"
88+
- traefik.enable=true
89+
- traefik.http.routers.user.entrypoints=websecure
90+
- traefik.http.routers.user.rule=Host(`api.${EC2_PUBLIC_IP}.nip.io`) && PathPrefix(`/user`)
91+
- traefik.http.routers.user.tls.certresolver=letsencrypt
92+
- traefik.http.services.user.loadbalancer.server.port=80
7693

7794
genai-service:
78-
image: ${GENAI_IMAGE}
95+
image: ghcr.io/aet-devops25/team-devoops/server/genai:latest
7996
container_name: genai-service
80-
networks:
81-
- backend
82-
labels:
83-
- "traefik.enable=true"
84-
- "traefik.http.routers.genai.rule=Host(`${SERVER_HOST}`) && PathPrefix(`/genai`)"
85-
- "traefik.http.services.genai.loadbalancer.server.port=80"
86-
- "traefik.http.routers.genai.entrypoints=websecure"
87-
- "traefik.http.routers.genai.tls.certresolver=letsencrypt"
88-
89-
client:
90-
image: ${CLIENT_IMAGE}
91-
environment:
92-
- PUBLIC_API_URL=${PUBLIC_API_URL}
93-
depends_on:
94-
- gateway-service
95-
restart: unless-stopped
96-
networks:
97-
- backend
9897
labels:
99-
- "traefik.enable=true"
100-
- "traefik.http.routers.client.rule=Host(`${CLIENT_HOST}`)"
101-
- "traefik.http.services.client.loadbalancer.server.port=80"
102-
- "traefik.http.routers.client.entrypoints=websecure"
103-
- "traefik.http.routers.client.tls.certresolver=letsencrypt"
104-
- "traefik.http.middlewares.client-compress.compress=true"
105-
- "traefik.http.routers.client.middlewares=client-compress"
106-
- "traefik.http.routers.client.priority=1"
98+
- traefik.enable=true
99+
- traefik.http.routers.genai.entrypoints=websecure
100+
- traefik.http.routers.genai.rule=Host(`api.${EC2_PUBLIC_IP}.nip.io`) && PathPrefix(`/genai`)
101+
- traefik.http.routers.genai.tls.certresolver=letsencrypt
102+
- traefik.http.services.genai.loadbalancer.server.port=80
107103

108104
networks:
109105
backend:

0 commit comments

Comments
 (0)