Skip to content

Commit 850c98d

Browse files
committed
feat: update deployment workflow to use ORACLE_VM_IP secret for improved clarity and consistency
1 parent ad916f4 commit 850c98d

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

.github/workflows/deploy.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build-and-deploy:
1010
runs-on: ubuntu-latest
1111
env:
12-
ORACLE_VM_IP: ${{ secrets.VM_IP_ADDRESS }}
12+
ORACLE_VM_IP: ${{ secrets.ORACLE_VM_IP }}
1313
DOCKER_REGISTRY: ${{ secrets.OCI_REGISTRY }}
1414
OCI_USERNAME: ${{ secrets.OCI_USERNAME }}
1515
OCI_AUTH_TOKEN: ${{ secrets.OCI_AUTH_TOKEN }}
@@ -117,7 +117,7 @@ jobs:
117117
- name: Debug environment variables
118118
run: |
119119
echo "Checking environment variables (with sensitive data masked):"
120-
echo "ORACLE_VM_IP is set: ${{ secrets.VM_IP_ADDRESS != '' }}"
120+
echo "ORACLE_VM_IP is set: ${{ secrets.ORACLE_VM_IP != '' }}"
121121
echo "DOCKER_REGISTRY is set: ${{ secrets.OCI_REGISTRY != '' }}"
122122
echo "OCI_USERNAME is set: ${{ secrets.OCI_USERNAME != '' }}"
123123
echo "OCI_AUTH_TOKEN is set: ${{ secrets.OCI_AUTH_TOKEN != '' }}"
@@ -150,20 +150,20 @@ jobs:
150150
echo "SSH key file size: $key_size bytes"
151151
152152
# Add VM to known hosts
153-
if [ -z "${{ secrets.VM_IP_ADDRESS }}" ]; then
154-
echo "ERROR: VM_IP_ADDRESS secret is not set!"
153+
if [ -z "${{ secrets.ORACLE_VM_IP }}" ]; then
154+
echo "ERROR: ORACLE_VM_IP secret is not set!"
155155
exit 1
156156
fi
157157
158158
# Initialize known_hosts file
159159
touch $HOME/.ssh/known_hosts
160160
161161
# Add VM to known hosts
162-
ssh-keyscan -H ${{ secrets.VM_IP_ADDRESS }} >> $HOME/.ssh/known_hosts
162+
ssh-keyscan -H ${{ secrets.ORACLE_VM_IP }} >> $HOME/.ssh/known_hosts
163163
164164
# Test SSH connection
165165
echo "Testing SSH connection..."
166-
ssh -o BatchMode=yes -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa opc@${{ secrets.VM_IP_ADDRESS }} "echo SSH connection successful" || {
166+
ssh -o BatchMode=yes -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa opc@${{ secrets.ORACLE_VM_IP }} "echo SSH connection successful" || {
167167
echo "ERROR: SSH connection failed. Debugging information:"
168168
ls -la $HOME/.ssh/
169169
echo "Key file content (first line only):"
@@ -174,20 +174,20 @@ jobs:
174174
- name: Deploy to Oracle VM
175175
run: |
176176
# Create directories on VM
177-
ssh -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa opc@${{ secrets.VM_IP_ADDRESS }} "mkdir -p ~/music-analytics/vm-deploy/{eureka-server,api-gateway,recommendation-service,statistics-service,user-tracking-service}"
177+
ssh -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa opc@${{ secrets.ORACLE_VM_IP }} "mkdir -p ~/music-analytics/vm-deploy/{eureka-server,api-gateway,recommendation-service,statistics-service,user-tracking-service}"
178178
179179
# Copy JAR files and Dockerfiles to VM
180-
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/eureka-server/eureka-server.jar vm-deploy/eureka-server/Dockerfile opc@${{ secrets.VM_IP_ADDRESS }}:~/music-analytics/vm-deploy/eureka-server/
181-
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/api-gateway/api-gateway.jar vm-deploy/api-gateway/Dockerfile opc@${{ secrets.VM_IP_ADDRESS }}:~/music-analytics/vm-deploy/api-gateway/
182-
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/recommendation-service/recommendation-service.jar vm-deploy/recommendation-service/Dockerfile opc@${{ secrets.VM_IP_ADDRESS }}:~/music-analytics/vm-deploy/recommendation-service/
183-
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/statistics-service/statistics-service.jar vm-deploy/statistics-service/Dockerfile opc@${{ secrets.VM_IP_ADDRESS }}:~/music-analytics/vm-deploy/statistics-service/
184-
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/user-tracking-service/user-tracking-service.jar vm-deploy/user-tracking-service/Dockerfile opc@${{ secrets.VM_IP_ADDRESS }}:~/music-analytics/vm-deploy/user-tracking-service/
180+
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/eureka-server/eureka-server.jar vm-deploy/eureka-server/Dockerfile opc@${{ secrets.ORACLE_VM_IP }}:~/music-analytics/vm-deploy/eureka-server/
181+
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/api-gateway/api-gateway.jar vm-deploy/api-gateway/Dockerfile opc@${{ secrets.ORACLE_VM_IP }}:~/music-analytics/vm-deploy/api-gateway/
182+
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/recommendation-service/recommendation-service.jar vm-deploy/recommendation-service/Dockerfile opc@${{ secrets.ORACLE_VM_IP }}:~/music-analytics/vm-deploy/recommendation-service/
183+
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/statistics-service/statistics-service.jar vm-deploy/statistics-service/Dockerfile opc@${{ secrets.ORACLE_VM_IP }}:~/music-analytics/vm-deploy/statistics-service/
184+
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa vm-deploy/user-tracking-service/user-tracking-service.jar vm-deploy/user-tracking-service/Dockerfile opc@${{ secrets.ORACLE_VM_IP }}:~/music-analytics/vm-deploy/user-tracking-service/
185185
186186
# Copy docker-compose file
187-
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa cloud-deploy/docker-compose.direct.yml opc@${{ secrets.VM_IP_ADDRESS }}:~/music-analytics/vm-deploy/docker-compose.yml
187+
scp -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa cloud-deploy/docker-compose.direct.yml opc@${{ secrets.ORACLE_VM_IP }}:~/music-analytics/vm-deploy/docker-compose.yml
188188
189189
# Build and run containers
190-
ssh -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa opc@${{ secrets.VM_IP_ADDRESS }} "cd ~/music-analytics/vm-deploy && \
190+
ssh -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa opc@${{ secrets.ORACLE_VM_IP }} "cd ~/music-analytics/vm-deploy && \
191191
echo 'Logging in to Docker registry...' && \
192192
docker login ${{ env.DOCKER_REGISTRY }} -u ${{ env.OCI_USERNAME }} -p ${{ env.OCI_AUTH_TOKEN }} && \
193193
echo 'Stopping ALL existing containers...' && \
@@ -203,7 +203,7 @@ jobs:
203203
if: failure()
204204
run: |
205205
if [ -f "$HOME/.ssh/id_rsa" ]; then
206-
ssh -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa opc@${{ secrets.VM_IP_ADDRESS }} '
206+
ssh -o StrictHostKeyChecking=no -i $HOME/.ssh/id_rsa opc@${{ secrets.ORACLE_VM_IP }} '
207207
echo "==== EUREKA SERVER LOGS ====" &&
208208
docker logs $(docker ps -q -f name=eureka-server) || echo "No eureka-server logs available"
209209
'

0 commit comments

Comments
 (0)