forked from BLC/sgeUpdated
Compare commits
5 Commits
fix/harbor
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 47f06688e0 | |||
| a0ec570147 | |||
| 7696d0f133 | |||
| e67dcea72e | |||
| 49ce97d394 |
@@ -22,6 +22,8 @@ jobs:
|
|||||||
|
|
||||||
- name: Run deploy script on server
|
- name: Run deploy script on server
|
||||||
run: |
|
run: |
|
||||||
# We add -tt to force a pseudo-terminal (fixes that stdin error)
|
ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
|
||||||
# We call bash -lc to force a Login Shell, which loads your credentials
|
echo "✅ PR merged into main — running deploy script..."
|
||||||
ssh -tt ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} "bash -lc 'cd /home/ubuntu/Bgreen/sgeUpdated && ./deploy.sh'"
|
cd /home/ubuntu/Bgreen/sgeUpdated
|
||||||
|
./deploy.sh
|
||||||
|
EOF
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ cd /home/ubuntu/Bgreen/sgeUpdated
|
|||||||
# -----------------------
|
# -----------------------
|
||||||
# Harbor settings
|
# Harbor settings
|
||||||
# -----------------------
|
# -----------------------
|
||||||
HARBOR_REGISTRY="10.10.100.110:8085"
|
HARBOR_REGISTRY="10.150.1.166"
|
||||||
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 within git commit (better than latest; enables rollback)
|
# Tag images with 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..."
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
bgreen-backend:
|
bgreen-backend:
|
||||||
build:
|
image: 10.150.1.166/bgreen/bgreen-backend:${VERSION}
|
||||||
context: ./sge-backend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
env_file:
|
env_file:
|
||||||
@@ -14,9 +12,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
bgreen-frontend:
|
bgreen-frontend:
|
||||||
build:
|
image: 10.150.1.166/bgreen/bgreen-frontend:${VERSION}
|
||||||
context: ./sge-frontend
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
env_file:
|
env_file:
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
<groupId>com.sgs</groupId>
|
<groupId>com.sgs</groupId>
|
||||||
<artifactId>sgs</artifactId>
|
<artifactId>sgs</artifactId>
|
||||||
<version>0.0.3-SNAPSHOT</version>
|
<version>0.0.4-SNAPSHOT</version>
|
||||||
<name>sgs</name>
|
<name>sgs</name>
|
||||||
<description>SGS project for Spring Boot</description>
|
<description>SGS project for Spring Boot</description>
|
||||||
<properties>
|
<properties>
|
||||||
@@ -130,4 +130,4 @@
|
|||||||
<finalName>sgs-backend</finalName>
|
<finalName>sgs-backend</finalName>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "sgs-web",
|
"name": "sgs-web",
|
||||||
"version": "1.0.1",
|
"version": "1.0.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@apollo/client": "^3.13.8",
|
"@apollo/client": "^3.13.8",
|
||||||
|
|||||||
Reference in New Issue
Block a user