comeback to alpine

2025-09-27 00:37:10 +03:00
parent 956c6fc4c6
commit a1a8d779a9
3 changed files with 61 additions and 53 deletions
@@ -1,31 +0,0 @@
-steps:
-  - name: deploy
-    image: alpine:latest
-    environment:
-      SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY}
-    commands:
-      # Установка SSH-клиента
-      - apk add --no-cache openssh-client rsync
-
-      # Настройка SSH-ключа из секрета
-      - mkdir -p ~/.ssh
-      - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
-      - chmod 600 ~/.ssh/id_rsa
-      - ssh-keyscan 192.168.0.109 >> ~/.ssh/known_hosts
-
-      # Копирование файлов (вариант 1: rsync)
-      - rsync -av ./ deployer@192.168.0.109:/opt/testbot-git/
-
-      # Или (вариант 2: git clone на целевом сервере)
-      # - ssh -i ~/.ssh/id_rsa deployer@целевой-сервер "cd /var/www/myapp && git pull"
-
-      # Выполнение команд на целевом сервере
-      #      - ssh -i ~/.ssh/id_rsa deployer@целевой-сервер "
-      #      cd /var/www/myapp &&
-      #          systemctl --user daemon-reload || sudo systemctl daemon-reload &&
-      #          sudo systemctl restart myservice &&
-      #          echo '✅ Deploy completed'
-      #        "
-when:
-  event: push
-  branch: main
@@ -0,0 +1,27 @@
+steps:
+
+  - name: prepare
+    image: alpine:latest
+    commands:
+      - ls -la
+      - pwd
+      - 'echo "CI_WORKSPACE = $CI_WORKSPACE"'
+      - ls -la $CI_WORKSPACE/
+      - find . -type f | head -n 20
+  - name: deploy
+    image: appleboy/drone-ssh
+    settings:
+      host: 192.168.0.109
+      user: deployer
+      key:
+        from_secret: SSH_PRIVATE_KEY
+      script:
+        - ls -la
+        - pwd
+        - 'echo "CI_WORKSPACE = $CI_WORKSPACE"'
+        - ls -la $CI_WORKSPACE/
+        - find . -type f | head -n 20
+        - rsync -av ./ /opt/testbot-git/
+when:
+  event: push
+  branch: main
@@ -1,27 +1,39 @@
 steps:
-
-  - name: prepare
-    image: alpine:latest
-    commands:
-      - ls -la
-      - pwd
-      - 'echo "CI_WORKSPACE = $CI_WORKSPACE"'
-      - ls -la $CI_WORKSPACE/
-      - find . -type f | head -n 20
  - name: deploy
-    image: appleboy/drone-ssh
-    settings:
-      host: 192.168.0.109
-      user: deployer
-      key:
-        from_secret: SSH_PRIVATE_KEY
-      script:
-        - ls -la
-        - pwd
-        - 'echo "CI_WORKSPACE = $CI_WORKSPACE"'
-        - ls -la $CI_WORKSPACE/
-        - find . -type f | head -n 20
-        - rsync -av ./ /opt/testbot-git/
+    image: alpine:latest
+    environment:
+      SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY}
+    commands:
+      # Установка SSH-клиента
+      - apk add --no-cache openssh-client rsync
+
+      # Настройка SSH-ключа из секрета
+      - mkdir -p ~/.ssh
+      - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
+      - chmod 600 ~/.ssh/id_rsa
+      - 'echo "Key header:"'
+      - head -n 1 ~/.ssh/id_rsa
+      - 'echo "Key footer:"'
+      - tail -n 1 ~/.ssh/id_rsa
+      - 'echo "File size:"'
+      - wc -c ~/.ssh/id_rsa
+      - ssh-keygen -y -f ~/.ssh/id_rsa > /dev/null && echo "✅ Key is valid" || echo "❌ Key is invalid"
+
+      - ssh-keyscan 192.168.0.109 >> ~/.ssh/known_hosts
+
+      # Копирование файлов (вариант 1: rsync)
+      - rsync -av ./ deployer@192.168.0.109:/opt/testbot-git/
+
+      # Или (вариант 2: git clone на целевом сервере)
+      # - ssh -i ~/.ssh/id_rsa deployer@целевой-сервер "cd /var/www/myapp && git pull"
+
+      # Выполнение команд на целевом сервере
+      #      - ssh -i ~/.ssh/id_rsa deployer@целевой-сервер "
+      #      cd /var/www/myapp &&
+      #          systemctl --user daemon-reload || sudo systemctl daemon-reload &&
+      #          sudo systemctl restart myservice &&
+      #          echo '✅ Deploy completed'
+      #        "
 when:
  event: push
  branch: main