9 Commits
main ... main

5 changed files with 12 additions and 8 deletions

View File

@@ -23,7 +23,7 @@ jobs:
- name: Run deploy script on server - name: Run deploy script on server
run: | run: |
ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF' ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
echo "✅ PR merged into main — running deploy script..." echo "✅ PR merged into main — running deploy script.."
cd /home/ubuntu/Bgreen/sgeUpdated cd /home/ubuntu/Bgreen/sgeUpdated
./deploy.sh ./deploy.sh
EOF EOF

View File

@@ -6,13 +6,13 @@ cd /home/ubuntu/Bgreen/sgeUpdated
# ----------------------- # -----------------------
# Harbor settings # Harbor settings
# ----------------------- # -----------------------
HARBOR_REGISTRY="10.150.1.166" HARBOR_REGISTRY="10.10.100.110:8085"
HARBOR_PROJECT="bgreen" HARBOR_PROJECT="bgreen"
BACKEND_IMAGE_REPO="${HARBOR_REGISTRY}/${HARBOR_PROJECT}/bgreen-backend" BACKEND_IMAGE_REPO="${HARBOR_REGISTRY}/${HARBOR_PROJECT}/bgreen-backend"
FRONTEND_IMAGE_REPO="${HARBOR_REGISTRY}/${HARBOR_PROJECT}/bgreen-frontend" FRONTEND_IMAGE_REPO="${HARBOR_REGISTRY}/${HARBOR_PROJECT}/bgreen-frontend"
# Tag images with git commit (better than latest; enables rollback) # Tag images within git commit (better than latest; enables rollback)
VERSION="$(git rev-parse --short HEAD)" VERSION="$(git rev-parse --short HEAD)"
echo "📦 Fetching latest changes from origin/main..." echo "📦 Fetching latest changes from origin/main..."

View File

@@ -1,6 +1,8 @@
services: services:
bgreen-backend: bgreen-backend:
image: 10.150.1.166/bgreen/bgreen-backend:${VERSION} build:
context: ./sge-backend
dockerfile: Dockerfile
ports: ports:
- "8080:8080" - "8080:8080"
env_file: env_file:
@@ -12,7 +14,9 @@ services:
restart: unless-stopped restart: unless-stopped
bgreen-frontend: bgreen-frontend:
image: 10.150.1.166/bgreen/bgreen-frontend:${VERSION} build:
context: ./sge-frontend
dockerfile: Dockerfile
ports: ports:
- "80:80" - "80:80"
env_file: env_file:

View File

@@ -11,7 +11,7 @@
</parent> </parent>
<groupId>com.sgs</groupId> <groupId>com.sgs</groupId>
<artifactId>sgs</artifactId> <artifactId>sgs</artifactId>
<version>0.0.4-SNAPSHOT</version> <version>0.0.3-SNAPSHOT</version>
<name>sgs</name> <name>sgs</name>
<description>SGS project for Spring Boot</description> <description>SGS project for Spring Boot</description>
<properties> <properties>

View File

@@ -1,6 +1,6 @@
{ {
"name": "sgs-web", "name": "sgs-web",
"version": "1.0.2", "version": "1.0.1",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@apollo/client": "^3.13.8", "@apollo/client": "^3.13.8",