feat: CI/CD yapılandırmasında konteyner durdurma ve kaldırma adımları eklendi; ortam değişkenleri ile yapılandırma iyileştirildi

Author: omerada

.github/workflows/activity-log-service-ci-cd.yml

@@ -75,56 +75,38 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
             echo "Starting deployment of Activity Log Service..."
+            # Pull the latest image
             docker pull ${{ secrets.DOCKERHUB_USERNAME }}/activity-log-service:latest-arm64
+
+            # Stop and remove existing container
             docker stop activity-log-service || true
             docker rm activity-log-service || true
 
-            # Debug veya prod modu için container yapılandırması
-            if [[ "${{ github.event.inputs.environment }}" == "debug" ]]; then
-              # Debug modu
-              docker run -d \
-                --name activity-log-service \
-                --network craftpilot-network \
-                --restart unless-stopped \
-                -p 8095:8095 \
-                -p 5010:5010 \
-                -e SPRING_PROFILES_ACTIVE=prod \
-                -e KAFKA_BOOTSTRAP_SERVERS=kafka:9092 \
-                -e EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://craftpilot:13579ada@eureka-server:8761/eureka/ \
-                -e SPRING_SECURITY_USER_NAME=craftpilot \
-                -e SPRING_SECURITY_USER_PASSWORD=13579ada \
-                -e MONGODB_URI=mongodb://craftpilotadmin:secure_password@mongodb:27017/craftpilot?authSource=admin&retryWrites=true&w=majority \
-                -e MONGODB_DATABASE=craftpilot \
-                -e REDIS_HOST=redis \
-                -e REDIS_PORT=6379 \
-                -e REDIS_PASSWORD=13579ada \
-                -e MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE="*" \
-                -e MANAGEMENT_ENDPOINT_HEALTH_SHOW_DETAILS=always \
-                -e "JAVA_OPTS=-XX:+UseContainerSupport -XX:MaxRAMPercentage=70.0 -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010" \
-                ${{ secrets.DOCKERHUB_USERNAME }}/activity-log-service:latest-arm64
+            # Determine environment from input
+            ENV_TYPE="${{ github.event.inputs.environment }}"
+
+            # Base command with common parameters
+            BASE_CMD="docker run -d --name activity-log-service --network craftpilot-network --restart unless-stopped -p 8095:8095"
+
+            # Environment variables for both environments
+            ENV_VARS="-e SPRING_PROFILES_ACTIVE=prod -e KAFKA_BOOTSTRAP_SERVERS=kafka:9092 -e EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://craftpilot:13579ada@eureka-server:8761/eureka/ -e SPRING_SECURITY_USER_NAME=craftpilot -e SPRING_SECURITY_USER_PASSWORD=13579ada -e MONGODB_URI=mongodb://craftpilotadmin:secure_password@mongodb:27017/craftpilot?authSource=admin&retryWrites=true&w=majority -e MONGODB_DATABASE=craftpilot -e REDIS_HOST=redis -e REDIS_PORT=6379 -e REDIS_PASSWORD=13579ada -e MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE='*' -e MANAGEMENT_ENDPOINT_HEALTH_SHOW_DETAILS=always"
+
+            # Java options based on environment
+            if [ "$ENV_TYPE" == "debug" ]; then
+              echo "Deploying in DEBUG mode"
+              JAVA_OPTS="-e \"JAVA_OPTS=-XX:+UseContainerSupport -XX:MaxRAMPercentage=70.0 -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5010\""
+              DEBUG_PORT="-p 5010:5010"
+              FULL_CMD="$BASE_CMD $DEBUG_PORT $ENV_VARS $JAVA_OPTS ${{ secrets.DOCKERHUB_USERNAME }}/activity-log-service:latest-arm64"
             else
-              # Prod modu
-              docker run -d \
-                --name activity-log-service \
-                --network craftpilot-network \
-                --restart unless-stopped \
-                -p 8095:8095 \
-                -e SPRING_PROFILES_ACTIVE=prod \
-                -e KAFKA_BOOTSTRAP_SERVERS=kafka:9092 \
-                -e EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://craftpilot:13579ada@eureka-server:8761/eureka/ \
-                -e SPRING_SECURITY_USER_NAME=craftpilot \
-                -e SPRING_SECURITY_USER_PASSWORD=13579ada \
-                -e MONGODB_URI=mongodb://craftpilotadmin:secure_password@mongodb:27017/craftpilot?authSource=admin&retryWrites=true&w=majority \
-                -e MONGODB_DATABASE=craftpilot \
-                -e REDIS_HOST=redis \
-                -e REDIS_PORT=6379 \
-                -e REDIS_PASSWORD=13579ada \
-                -e MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE="*" \
-                -e MANAGEMENT_ENDPOINT_HEALTH_SHOW_DETAILS=always \
-                -e "JAVA_OPTS=-XX:+UseContainerSupport -XX:MaxRAMPercentage=70.0 -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom" \
-                ${{ secrets.DOCKERHUB_USERNAME }}/activity-log-service:latest-arm64
+              echo "Deploying in PRODUCTION mode"
+              JAVA_OPTS="-e \"JAVA_OPTS=-XX:+UseContainerSupport -XX:MaxRAMPercentage=70.0 -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom\""
+              FULL_CMD="$BASE_CMD $ENV_VARS $JAVA_OPTS ${{ secrets.DOCKERHUB_USERNAME }}/activity-log-service:latest-arm64"
             fi
 
+            # Execute the command
+            echo "Running container with command: $FULL_CMD"
+            eval $FULL_CMD
+
             # Health check
             echo "Waiting for service to start..."
             for i in {1..12}; do