Skip to content

Commit ce44ff2

Browse files
omeradaomerada
committed
git workflow.
1 parent 8991ae4 commit ce44ff2

File tree

55 files changed

+706
-1812
lines changed

Some content is hidden

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

55 files changed

+706
-1812
lines changed

‎.github/workflows/admin-service-ci-cd.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,3 @@ jobs:
136136
echo "Servis başlatılamadı - Son container logları:"
137137
docker logs admin-service
138138
exit 1
139-
140-
- name: Trigger Deploy Services Workflow
141-
if: success()
142-
uses: peter-evans/repository-dispatch@v2
143-
with:
144-
token: ${{ secrets.GH_TOKEN }}
145-
event-type: trigger-deploy-services

‎.github/workflows/analytics-service-ci-cd.yml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,6 @@ jobs:
7676
docker info
7777
docker ps
7878
79-
# Docker ağını oluştur (eğer yoksa)
80-
docker network create craftpilot-network || true
81-
82-
# Redis container'ını başlat (eğer çalışmıyorsa)
83-
if ! docker ps | grep -q redis; then
84-
docker run -d \
85-
--name redis \
86-
--network craftpilot-network \
87-
-p 6379:6379 \
88-
redis:latest
89-
fi
90-
91-
# Eureka server'ı başlat (eğer çalışmıyorsa)
92-
if ! docker ps | grep -q eureka-server; then
93-
docker run -d \
94-
--name eureka-server \
95-
--network craftpilot-network \
96-
-p 8761:8761 \
97-
-e SPRING_PROFILES_ACTIVE=prod \
98-
-e EUREKA_USERNAME=craftpilot \
99-
-e EUREKA_PASSWORD=13579ada \
100-
${{ secrets.DOCKERHUB_USERNAME }}/eureka-server:latest-arm64
101-
fi
102-
10379
echo "=== Pulling ARM64 Image ==="
10480
docker pull ${{ secrets.DOCKERHUB_USERNAME }}/analytics-service:latest-arm64
10581
@@ -148,10 +124,3 @@ jobs:
148124
echo "Service failed health check"
149125
docker logs analytics-service
150126
exit 1
151-
152-
- name: Trigger Deploy Services Workflow
153-
if: success()
154-
uses: peter-evans/repository-dispatch@v2
155-
with:
156-
token: ${{ secrets.GH_TOKEN }}
157-
event-type: trigger-deploy-services

‎.github/workflows/api-gateway-ci-cd.yml‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,7 @@ jobs:
6666
username: ${{ secrets.SSH_USERNAME }}
6767
key: ${{ secrets.SSH_PRIVATE_KEY }}
6868
script: |
69-
# Infrastructure setup
70-
echo "=== Setting up infrastructure ==="
71-
docker network create craftpilot-network || true
72-
73-
# Start Redis if not running
74-
if ! docker ps | grep -q redis; then
75-
docker run -d \
76-
--name redis \
77-
--network craftpilot-network \
78-
-p 6379:6379 \
79-
-e REDIS_PASSWORD=13579ada \
80-
redis:latest --requirepass 13579ada
81-
fi
82-
69+
8370
# Deploy API Gateway
8471
echo "=== Deploying API Gateway ==="
8572
docker pull ${{ secrets.DOCKERHUB_USERNAME }}/api-gateway:latest-arm64
@@ -141,10 +128,3 @@ jobs:
141128
echo "Container Logs:"
142129
docker logs api-gateway --tail 100
143130
exit 1
144-
145-
- name: Trigger Deploy Services Workflow
146-
if: success()
147-
uses: peter-evans/repository-dispatch@v2
148-
with:
149-
token: ${{ secrets.GH_TOKEN }}
150-
event-type: trigger-deploy-services

‎.github/workflows/credit-service-ci-cd.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,6 @@ jobs:
6666
username: ${{ secrets.SSH_USERNAME }}
6767
key: ${{ secrets.SSH_PRIVATE_KEY }}
6868
script: |
69-
# Infrastructure containers
70-
docker network create craftpilot-network || true
71-
72-
# Start Redis if not running
73-
if ! docker ps | grep -q redis; then
74-
docker run -d \
75-
--name redis \
76-
--network craftpilot-network \
77-
-p 6379:6379 \
78-
-e REDIS_PASSWORD=13579ada \
79-
redis:latest --requirepass 13579ada
80-
fi
8169
8270
# Deploy Credit Service
8371
docker pull ${{ secrets.DOCKERHUB_USERNAME }}/credit-service:latest-arm64

‎.github/workflows/eureka-server-ci-cd.yml‎

Lines changed: 84 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,78 @@ jobs:
6666
username: ${{ secrets.SSH_USERNAME }}
6767
key: ${{ secrets.SSH_PRIVATE_KEY }}
6868
script: |
69-
# Infrastructure setup
69+
echo "=== Infrastructure Setup Started ==="
70+
71+
# Create network if not exists
7072
docker network create craftpilot-network || true
7173
74+
# Check and start Redis if not running
75+
if ! docker ps | grep -q redis; then
76+
echo "Starting Redis..."
77+
docker run -d \
78+
--name redis \
79+
--network craftpilot-network \
80+
-p 6379:6379 \
81+
-e REDIS_PASSWORD=13579ada \
82+
redis:latest redis-server --requirepass 13579ada
83+
84+
# Wait for Redis to be ready
85+
echo "Waiting for Redis to be ready..."
86+
for i in {1..30}; do
87+
if docker exec redis redis-cli -a 13579ada ping | grep -q "PONG"; then
88+
echo "Redis is ready"
89+
break
90+
fi
91+
echo "Waiting for Redis... attempt $i/30"
92+
sleep 2
93+
done
94+
else
95+
echo "Redis is already running"
96+
fi
97+
98+
# Check and start Zookeeper if not running
99+
if ! docker ps | grep -q zookeeper; then
100+
echo "Starting Zookeeper..."
101+
docker run -d \
102+
--name zookeeper \
103+
--network craftpilot-network \
104+
-e ZOOKEEPER_CLIENT_PORT=2181 \
105+
-e ZOOKEEPER_TICK_TIME=2000 \
106+
confluentinc/cp-zookeeper:latest
107+
108+
# Wait for Zookeeper
109+
echo "Waiting for Zookeeper to be ready..."
110+
sleep 10
111+
else
112+
echo "Zookeeper is already running"
113+
fi
114+
115+
# Check and start Kafka if not running
116+
if ! docker ps | grep -q kafka; then
117+
echo "Starting Kafka..."
118+
docker run -d \
119+
--name kafka \
120+
--network craftpilot-network \
121+
-p 9092:9092 \
122+
-e KAFKA_BROKER_ID=1 \
123+
-e KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 \
124+
-e KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092 \
125+
-e KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 \
126+
-e KAFKA_TRANSACTION_STATE_LOG_MIN_ISR=1 \
127+
-e KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR=1 \
128+
confluentinc/cp-kafka:latest
129+
130+
# Wait for Kafka
131+
echo "Waiting for Kafka to be ready..."
132+
sleep 20
133+
else
134+
echo "Kafka is already running"
135+
fi
136+
137+
echo "=== Infrastructure Setup Completed ==="
138+
72139
# Deploy Eureka Server
140+
echo "=== Deploying Eureka Server ==="
73141
docker pull ${{ secrets.DOCKERHUB_USERNAME }}/eureka-server:latest-arm64
74142
docker stop eureka-server || true
75143
docker rm eureka-server || true
@@ -91,43 +159,26 @@ jobs:
91159
-e MANAGEMENT_ENDPOINT_HEALTH_SHOW_DETAILS=always \
92160
${{ secrets.DOCKERHUB_USERNAME }}/eureka-server:latest-arm64
93161
94-
# Wait for container to start
95-
echo "Waiting for container to start..."
96-
sleep 20
97-
98-
# Health check
99-
echo "Starting health checks..."
100-
max_retries=5
101-
count=0
102-
103-
while [ $count -lt $max_retries ]; do
104-
count=$((count + 1))
105-
echo "Health check attempt $count/$max_retries"
162+
# Enhanced health check for Eureka Server
163+
echo "=== Performing Health Checks ==="
164+
for i in {1..30}; do
165+
echo "Health check attempt $i/30"
106166
107-
if docker ps | grep -q "eureka-server"; then
108-
if curl -s "http://localhost:8761" | grep -q "Eureka"; then
109-
echo "Eureka Server is running and responding"
110-
exit 0
111-
elif curl -s -u craftpilot:13579ada "http://localhost:8761/actuator/health" | grep -q "UP"; then
112-
echo "Eureka Server health check passed"
113-
exit 0
114-
elif docker logs eureka-server 2>&1 | grep -q "Started EurekaServerApplication"; then
115-
echo "Eureka Server logs indicate successful startup"
116-
exit 0
117-
fi
167+
if curl -sf http://localhost:8761/actuator/health | grep -q "UP"; then
168+
echo "✓ Eureka Server is healthy"
169+
echo "=== Deployment Completed Successfully ==="
170+
exit 0
171+
fi
172+
173+
if [ $i -eq 15 ]; then
174+
echo "Mid-point container logs:"
175+
docker logs eureka-server --tail 50
118176
fi
119177
120-
echo "Waiting 10 seconds before next attempt..."
178+
echo "Waiting for next check..."
121179
sleep 10
122180
done
123181
124-
echo "Eureka Server failed to start properly"
182+
echo "=== Deployment Failed - Debug Information ==="
125183
docker logs eureka-server
126184
exit 1
127-
128-
- name: Trigger Deploy Services Workflow
129-
if: success()
130-
uses: peter-evans/repository-dispatch@v2
131-
with:
132-
token: ${{ secrets.GH_TOKEN }}
133-
event-type: trigger-deploy-services

‎.github/workflows/image-service-ci-cd.yml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -66,29 +66,6 @@ jobs:
6666
username: ${{ secrets.SSH_USERNAME }}
6767
key: ${{ secrets.SSH_PRIVATE_KEY }}
6868
script: |
69-
# Infrastructure setup
70-
docker network create craftpilot-network || true
71-
72-
# Start Redis first
73-
echo "=== Starting Redis ==="
74-
if ! docker ps | grep -q redis; then
75-
docker run -d \
76-
--name redis \
77-
--network craftpilot-network \
78-
-p 6379:6379 \
79-
redis:latest redis-server --requirepass 13579ada
80-
fi
81-
82-
# Wait for Redis
83-
echo "=== Waiting for Redis ==="
84-
for i in {1..30}; do
85-
if docker exec redis redis-cli -a 13579ada ping | grep -q "PONG"; then
86-
echo "Redis is ready"
87-
break
88-
fi
89-
echo "Waiting for Redis... attempt $i/30"
90-
sleep 2
91-
done
9269
9370
# Deploy Image Service
9471
echo "=== Deploying Image Service ==="
@@ -176,10 +153,3 @@ jobs:
176153
echo "Container Logs:"
177154
docker logs image-service
178155
exit 1
179-
180-
- name: Trigger Deploy Services Workflow
181-
if: success()
182-
uses: peter-evans/repository-dispatch@v2
183-
with:
184-
token: ${{ secrets.GH_TOKEN }}
185-
event-type: trigger-deploy-services

0 commit comments

Comments
 (0)