@@ -104,33 +104,17 @@ jobs:
104104 run : |
105105 ssh -i private_key -o StrictHostKeyChecking=no ${{ secrets.GCP_USERNAME }}@${{ secrets.GCP_VM_IP }} << 'EOF'
106106 cd /home/masahisasekita/term-group-project-c01w25-project-course-matrix || { echo "Error: Directory /root/myapp does not exist!"; exit 1; }
107- git fetch
108- git pull develop
109- cd course-matrix
110-
111- # Update frontend .env
112- cd frontend
113- rm -f .env # Delete the existing .env file
114- echo "VITE_SERVER_URL=\"http://34.130.253.243:8081\"" > .env && \
115- echo "VITE_PUBLIC_ASSISTANT_BASE_URL=\"${{ secrets.VITE_PUBLIC_ASSISTANT_BASE_URL }}\"" >> .env && \
116- echo "VITE_ASSISTANT_UI_KEY=\"${{ secrets.VITE_ASSISTANT_UI_KEY }}\"" >> .env
107+
108+ # Pull the latest images
109+ docker pull ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-frontend:master
110+ docker pull ${{ secrets.DOCKERHUB_USERNAME }}/course-matrix-backend:master
111+
112+ # Stop and remove existing containers
113+ docker compose down
117114
118- # Move to backend
119- cd ../backend
120- rm -f .env # Delete the existing .env file
121- echo "NODE_ENV=\"development\"" > .env && \
122- echo "PORT=8081" >> .env && \
123- echo "CLIENT_APP_URL=\"http://34.130.253.243:5173\"" >> .env && \
124- echo "DATABASE_URL=\"${{ secrets.DATABASE_URL }}\"" >> .env && \
125- echo "DATABASE_KEY=\"${{ secrets.DATABASE_KEY }}\"" >> .env && \
126- echo "OPENAI_API_KEY=\"${{ secrets.OPENAI_API_KEY }}\"" >> .env && \
127- echo "PINECONE_API_KEY=\"${{ secrets.PINECONE_API_KEY }}\"" >> .env && \
128- echo "PINECONE_INDEX_NAME=\"course-matrix\"" >> .env && \
129- echo "BREVO_API_KEY=\"${{ secrets.BREVO_API_KEY }}\"" >> .env && \
130- echo "SENDER_EMAIL=\"${{ secrets.SENDER_EMAIL }}\"" >> .env && \
131- echo "SENDER_NAME=\"Course Matrix Notifications\"" >> .env
115+ # Start new containers with the latest images
116+ docker compose up -d --pull always
132117
133- cd ../
134- docker compose build
135- docker compose up -d --remove-orphans
118+ # Confirm running containers
119+ docker ps
136120 EOF
0 commit comments