forked from BLC/sgeUpdated
Compare commits
8 Commits
testv
...
fix/harbor
| Author | SHA1 | Date | |
|---|---|---|---|
| b64abe3a3a | |||
|
|
54dcb584d6 | ||
| b6a4f0e303 | |||
|
|
e0c8286475 | ||
| 1ebf2f2f9d | |||
|
|
4ddffb6fff | ||
|
|
59b37a64f5 | ||
| a0041afce9 |
@@ -22,8 +22,6 @@ jobs:
|
|||||||
|
|
||||||
- name: Run deploy script on server
|
- name: Run deploy script on server
|
||||||
run: |
|
run: |
|
||||||
ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
|
# We add -tt to force a pseudo-terminal (fixes that stdin error)
|
||||||
echo "✅ PR merged into main — running deploy script.."
|
# We call bash -lc to force a Login Shell, which loads your credentials
|
||||||
cd /home/ubuntu/Bgreen/sgeUpdated
|
ssh -tt ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} "bash -lc 'cd /home/ubuntu/Bgreen/sgeUpdated && ./deploy.sh'"
|
||||||
./deploy.sh
|
|
||||||
EOF
|
|
||||||
|
|||||||
@@ -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..."
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
</parent>
|
</parent>
|
||||||
<groupId>com.sgs</groupId>
|
<groupId>com.sgs</groupId>
|
||||||
<artifactId>sgs</artifactId>
|
<artifactId>sgs</artifactId>
|
||||||
<version>0.0.2-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>
|
||||||
@@ -130,4 +130,4 @@
|
|||||||
<finalName>sgs-backend</finalName>
|
<finalName>sgs-backend</finalName>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
Reference in New Issue
Block a user