Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cefcb00624 | |||
| d081429318 | |||
| 9d530bd472 | |||
| 66ee081c80 | |||
| a2fc1ed141 | |||
| 3a0e3d419c | |||
| 77ba40f657 |
@@ -1,3 +1,4 @@
|
||||
BESZEL_HUB_URL=http://mon.localhost
|
||||
NEXTCLOUD_DOMAIN=cld.localhost
|
||||
GITEA_URL=http://git:3000
|
||||
RUSTDESK_DOMAIN=sup.local
|
||||
|
||||
@@ -23,6 +23,7 @@ jobs:
|
||||
ssh_host: ${{ secrets.SSH_HOST }}
|
||||
|
||||
- name: 📦 Create backup of data/ folder
|
||||
if: ${{ vars.DEPLOY_BACKUP_ENABLED == 'true' }}
|
||||
env:
|
||||
SSHPASS: ${{ secrets.SSH_PASSWORD }}
|
||||
SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
|
||||
@@ -42,13 +43,13 @@ jobs:
|
||||
echo "Creating backup of data/ into \${BACKUP_FILE}..."
|
||||
|
||||
if [ -d "data" ]; then
|
||||
echo "\$SSHPASS" | sudo -S tar -czf "\${BACKUP_FILE}" data
|
||||
echo "$SSHPASS" | sudo -S tar -czf "\${BACKUP_FILE}" data
|
||||
echo "✅ Backup created successfully!"
|
||||
else
|
||||
echo "⚡️ No data/ folder, backup creation skipped."
|
||||
fi
|
||||
|
||||
echo "\$SSHPASS" | sudo -S find backups/ -type f -name "backup-*.tar.gz" -mtime +7 -delete
|
||||
echo "$SSHPASS" | sudo -S find backups/ -type f -name "backup-*.tar.gz" -mtime +7 -delete
|
||||
EOT
|
||||
|
||||
- name: 🏗️ Create docker-compose file
|
||||
@@ -79,6 +80,7 @@ jobs:
|
||||
GITEA_URL: ${{ vars.GIT_URL }}
|
||||
VAULTWARDEN_ADMIN_TOKEN: ${{ secrets.VAULTWARDEN_ADMIN_TOKEN }}
|
||||
NEXTCLOUD_DOMAIN: ${{ vars.NEXTCLOUD_DOMAIN }}
|
||||
RUSTDESK_DOMAIN: ${{ vars.RUSTDESK_DOMAIN }}
|
||||
run: |
|
||||
sshpass -e ssh -p 22 "$SSH_USERNAME@$SSH_HOST" bash -s << EOT
|
||||
set -e
|
||||
@@ -88,6 +90,7 @@ jobs:
|
||||
BESZEL_HUB_URL=$BESZEL_HUB_URL
|
||||
NEXTCLOUD_DOMAIN=$NEXTCLOUD_DOMAIN
|
||||
GITEA_URL=$GITEA_URL
|
||||
RUSTDESK_DOMAIN=$RUSTDESK_DOMAIN
|
||||
EOF_ENV
|
||||
|
||||
mkdir -p secrets
|
||||
@@ -118,6 +121,8 @@ jobs:
|
||||
SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
|
||||
SSH_HOST: ${{ secrets.SSH_HOST }}
|
||||
DEPLOY_DIRECTORY: ${{ vars.DEPLOY_DIRECTORY }}
|
||||
DEPLOY_LOG_FILE: /tmp/deploy-${{ env.CLEAN_REF_NAME }}.log
|
||||
DRY_RUN_ENABLED: ${{ vars.DEPLOY_DRY_RUN_ENABLED }}
|
||||
REF_NAME: ${{ env.CLEAN_REF_NAME }}
|
||||
TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_DEPLOY_BOT_TOKEN }}
|
||||
TELEGRAM_CHAT: ${{ secrets.TELEGRAM_DEPLOY_CHAT_ID }}
|
||||
@@ -128,7 +133,6 @@ jobs:
|
||||
FAILURE_MESSAGE: |-
|
||||
❌ <b>Ошибка деплоя!</b>
|
||||
Релиз: <code>${{ gitea.ref_name }}</code>
|
||||
DEPLOY_LOG_FILE: /tmp/deploy-${{ env.CLEAN_REF_NAME }}.log
|
||||
run: |
|
||||
sshpass -e ssh -p 22 "$SSH_USERNAME@$SSH_HOST" bash -s << EOT
|
||||
set -e
|
||||
@@ -136,8 +140,14 @@ jobs:
|
||||
|
||||
nohup bash -c '
|
||||
sleep 5
|
||||
|
||||
if [ "${DRY_RUN_ENABLED}" = "true" ]; then
|
||||
DRY_RUN_FLAG="--dry-run"
|
||||
else
|
||||
DRY_RUN_FLAG=""
|
||||
fi
|
||||
|
||||
if docker compose --dry-run -f "docker-compose-${REF_NAME}.yml" up -d --remove-orphans > ${DEPLOY_LOG_FILE} 2>&1; then
|
||||
if docker compose \${DRY_RUN_FLAG} -f "docker-compose-${REF_NAME}.yml" up -d --remove-orphans > ${DEPLOY_LOG_FILE} 2>&1; then
|
||||
curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
|
||||
--proxy "${PROXY_URL}" \
|
||||
-d "chat_id=${TELEGRAM_CHAT}" \
|
||||
|
||||
@@ -7,6 +7,11 @@ services:
|
||||
ports:
|
||||
- '80:80'
|
||||
- '443:443'
|
||||
- '21116:21116/tcp'
|
||||
- '21116:21116/udp'
|
||||
- '21117:21117/tcp'
|
||||
- '21118:21118/tcp'
|
||||
- '21119:21119/tcp'
|
||||
volumes:
|
||||
- ./data/nginx-proxy-manager/data:/data
|
||||
- ./data/nginx-proxy-manager/letsencrypt:/etc/letsencrypt
|
||||
@@ -99,6 +104,28 @@ services:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
secrets:
|
||||
- gitea_runner_registration_token
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:9101/healthz"]
|
||||
interval: 30s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 10s
|
||||
|
||||
sup-hbbs:
|
||||
image: rustdesk/rustdesk-server:latest
|
||||
command: hbbs -r ${RUSTDESK_DOMAIN}:21117 -k _
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./data/rustdesk:/root
|
||||
depends_on:
|
||||
- sup-hbbr
|
||||
|
||||
sup-hbbr:
|
||||
image: rustdesk/rustdesk-server:latest
|
||||
command: hbbr
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ./data/rustdesk:/root
|
||||
|
||||
networks:
|
||||
default:
|
||||
|
||||
Reference in New Issue
Block a user