|
73 | 73 | exit 1 |
74 | 74 | } |
75 | 75 |
|
76 | | - # Ensure user-tracking-service build completes successfully |
77 | 76 | echo "Building user-tracking-service specifically..." |
78 | 77 | cd user-tracking-service && mvn -B package -DskipTests && cd .. |
79 | 78 |
|
|
87 | 86 | if [ -z "$JAR_PATH" ]; then |
88 | 87 | echo "Error: JAR not found for $service" |
89 | 88 | exit 1 |
90 | | - } |
| 89 | + fi |
91 | 90 | echo "$service build successful: $JAR_PATH" |
92 | 91 | done |
93 | 92 |
|
@@ -185,31 +184,23 @@ jobs: |
185 | 184 | echo "$SSH_KEY" > ssh_key.pem |
186 | 185 | chmod 600 ssh_key.pem |
187 | 186 | |
188 | | - # Create directory structure on VM |
189 | 187 | ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} "mkdir -p ~/music-analytics/vm-deploy" |
190 | 188 | |
191 | | - # Copy Docker Compose file to VM |
192 | 189 | scp -o StrictHostKeyChecking=no -i ssh_key.pem cloud-deploy/docker-compose.direct.yml opc@${ORACLE_VM_IP}:~/music-analytics/vm-deploy/docker-compose.yml |
193 | 190 | |
194 | | - # Deploy Docker services with correct environment variables and proper startup sequence |
195 | 191 | ssh -o StrictHostKeyChecking=no -i ssh_key.pem opc@${ORACLE_VM_IP} "cd ~/music-analytics/vm-deploy && \ |
196 | 192 | docker login ${DOCKER_REGISTRY} -u ${OCI_USERNAME} -p ${OCI_AUTH_TOKEN} && \ |
197 | 193 | export ORACLE_EXTERNAL_HOSTNAME=music-analytics.abenezeranglo.uk && \ |
198 | 194 | export EUREKA_CLIENT_SERVICEURL_DEFAULTZONE=http://eureka-server:8761/eureka/ && \ |
199 | 195 | export DOCKER_REGISTRY=${DOCKER_REGISTRY} && \ |
200 | | - # Stop and remove existing containers in reverse order |
201 | 196 | docker-compose down --remove-orphans && \ |
202 | | - # Remove old containers and unused images |
203 | 197 | docker container prune -f && \ |
204 | 198 | docker image prune -f && \ |
205 | | - # Pull latest images |
206 | 199 | docker-compose pull && \ |
207 | | - # Start services with proper dependency handling |
208 | 200 | docker-compose up -d eureka-server && \ |
209 | 201 | echo 'Waiting for Eureka server to be healthy...' && \ |
210 | 202 | timeout 300 bash -c 'until docker-compose ps eureka-server | grep -q "(healthy)"; do sleep 5; done' && \ |
211 | 203 | docker-compose up -d api-gateway recommendation-service statistics-service user-tracking-service && \ |
212 | | - # Verify all services are running |
213 | 204 | docker-compose ps && \ |
214 | 205 | docker logout ${DOCKER_REGISTRY}" |
215 | 206 |
|
|
0 commit comments