5 Commits
main ... main

Author SHA1 Message Date
47f06688e0 Update sge-backend/pom.xml 2025-12-17 19:35:00 +03:00
a0ec570147 Update sge-backend/pom.xml 2025-12-17 18:34:38 +03:00
7696d0f133 Update docker-compose.yml 2025-12-17 18:33:36 +03:00
e67dcea72e merge upstream 2025-12-17 18:22:57 +03:00
49ce97d394 Update sge-frontend/package.json 2025-12-14 22:01:39 +03:00
5 changed files with 8 additions and 12 deletions

View File

@@ -23,7 +23,7 @@ jobs:
- name: Run deploy script on server
run: |
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
./deploy.sh
EOF

View File

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

View File

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

View File

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

View File

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