·

Signed-off-by: JackWhh <5264499+jack_whh@user.noreply.gitee.com>

Dockerfile

@@ -1,6 +1,9 @@
 # Container image that runs your code
 FROM alpine:3.13
 
+RUN echo "http://mirrors.aliyun.com/alpine/v3.13/main" > /etc/apk/repositories
+RUN echo "http://mirrors.aliyun.com/alpine/v3.13/community" >> /etc/apk/repositories
+
 # Copies your code file from your action repository to the filesystem path `/` of the container
 COPY entrypoint.sh /entrypoint.sh
 

README.md

@@ -2,8 +2,7 @@
 
 > Use this action to deploy your files to server using `SSH Private Key`
 
-> 使用此`action`部署你的项目到服务器上,`仅支持密钥对连接`
-中文介绍链接：[使用Github Action 部署项目到云服务器](https://zhuanlan.zhihu.com/p/107545396)
+> 使用此`action`部署你的项目到服务器上，中文介绍链接：[使用Github Action 部署项目到云服务器](https://zhuanlan.zhihu.com/p/107545396)
 
 ## 1. Inputs 
 
@@ -12,108 +11,104 @@
 `username` | yes| | SSH username
 `server` | yes| | Remote host
 `port`| yes | 22 | Remote host port
-`ssh_private_key`| yes| | You can copy private key from your `ssh_private_key.pem` file, and save to`repo/settings/secrets`![](./resource/secret.jpg)
+`ssh_private_key`| no| | You can copy private key from your `ssh_private_key` file, and save to`repo/settings/secrets`![](./resource/secret.jpg)
 `local_path`| yes| ./* | `local_path` of you project, if you want put single file:use path like `./myfile`, if you want put directory: use path like `./static/*`, it will put all files under `static` directory. Default to `./*`(will put all files in your repo).
 `remote_path`|yes|| Remote path
 `sftp_only`| no| | If your port only accepts the sftp protocol, set this option to `true`. However, please note that when this option is set to `true`, the remote folder will not be created automatically.
 <strike>args</strike> `sftpArgs` | no| | other args yor want to use of sftp, E.g.`-o ConnectTimeout=5`
-`delete_remote_files` | no | false | Set `true` will delete all files in the remote path before upload. 
-`passowrd`| no| | SSH passsword，If a password is set, `ssh_private_key` is ignored
+`delete_remote_files` | no | false | Set to `true` will delete remote path  folder and all files in it. 
+`password`| no| | SSH passsword，If a password is set, `ssh_private_key` is ignored. `for @v1.2.4 and greater`
 
 > **Warning**
 
-> Be careful when use `delete_remote_files`, This will remove all files in your remote path before uploading
+> Be careful when use `delete_remote_files`, This will delete remote path  folder and all files in it
+
+-----
+
+## 2.Action Examples
+
+```yaml
+on: [push]
+
+jobs:
+    deploy_job:
+    runs-on: ubuntu-latest
+    name: deploy
+    steps:
+        - name: Checkout
+        uses: actions/checkout@v2
+        - name: deploy file
+        uses: wlixcc/SFTP-Deploy-Action@v1.2.4
+        with:
+            username: 'root'
+            server: 'your server ip'
+            ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} 
+            local_path: './static/*'
+            remote_path: '/var/www/app'
+            sftpArgs: '-o ConnectTimeout=5'
+```
+
+```yaml
+on: [push]
+
+jobs:
+    deploy_job:
+    runs-on: ubuntu-latest
+    name: deploy
+    steps:
+        - name: Checkout
+        uses: actions/checkout@v2
+        - name: Deploy file
+        uses: wlixcc/SFTP-Deploy-Action@v1.2.4
+        with:
+            username: ${{ secrets.FTP_USERNAME }}
+            server: ${{ secrets.FTP_SERVER }}
+            port: ${{ secrets.FTP_PORT }}
+            local_path: './static/*'
+            remote_path: '/var/www/app'
+            sftp_only: true
+            password: ${{ secrets.FTP_PASSWORD }}
+```
+
+## 3. [Deploy React App Example](https://github.com/wlixcc/React-Deploy)
 
 
+```yaml
+on: [push]
 
-## Action Example	
+jobs:
+    deploy_job:
+    runs-on: ubuntu-latest
+    name: build&deploy
+    steps:
+        # To use this repository's private action, you must check out the repository
+        - name: Checkout
+        uses: actions/checkout@v2
 
+        - name: Install Dependencies
+        run: yarn
+        - name: Build
+        run: yarn build
 
-	on: [push]
+        - name: deploy file to server
+        uses: wlixcc/SFTP-Deploy-Action@v1.2.4
+        with:
+            username: 'root'
+            server: '${{ secrets.SERVER_IP }}'
+            ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+            local_path: './build/*'
+            remote_path: '/var/www/react-app'
+            sftpArgs: '-o ConnectTimeout=5'
+```
 
-	jobs:
-	  deploy_job:
-	    runs-on: ubuntu-latest
-	    name: deploy
-	    steps:
-	      - name: Checkout
-	        uses: actions/checkout@v2
-	      - name: deploy file
-	        uses: wlixcc/SFTP-Deploy-Action@v1.2.3
-	        with:
-	          username: 'root'
-	          server: 'your server ip'
-	          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} 
-	          local_path: './static/*'
-	          remote_path: '/var/www/app'
-	          sftpArgs: '-o ConnectTimeout=5'
-
-## 1. [Deploy React App Example](https://github.com/wlixcc/React-Deploy)
-
-> If you use nginx, all you need to do is upload the static files to the server after the project is built
-
-	on: [push]
-	
-	jobs:
-	  deploy_job:
-	    runs-on: ubuntu-latest
-	    name: build&deploy
-	    steps:
-	      # To use this repository's private action, you must check out the repository
-	      - name: Checkout
-	        uses: actions/checkout@v2
-	
-	      - name: Install Dependencies
-	        run: yarn
-	      - name: Build
-	        run: yarn build
-	
-	      - name: deploy file to server
-	        uses: wlixcc/SFTP-Deploy-Action@v1.2.4
-	        with:
-	          username: 'root'
-	          server: '${{ secrets.SERVER_IP }}'
-	          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
-	          local_path: './build/*'
-	          remote_path: '/var/www/react-app'
-	          sftpArgs: '-o ConnectTimeout=5'
-	          
  ![](./resource/reactExample.jpg)
  
-## 2.Deploy Umi App Example (Ant Design Pro)
+ --------
 
-	name: continuous deployment
-	on: [push]
-	
-	jobs:
-	  deploy_job:
-	    runs-on: ubuntu-latest
-	    name: build&deploy
-	    steps:
-	      # To use this repository's private action, you must check out the repository
-	      - name: Checkout
-	        uses: actions/checkout@v2
-	     
-	      - name: Install umi
-	        run: yarn global add umi  
-	
-	      - name: Install Dependencies
-	        run: yarn
-	      - name: Build
-	        run: yarn build
-	
-	      - name: deploy file to server
-	        uses: wlixcc/SFTP-Deploy-Action@v1.2.4
-	        with:
-	          username: 'root'
-	          server: '${{ secrets.SERVER_IP }}'
-	          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
-	          local_path: './dist/*'
-	          remote_path: '/var/www/umiapp'
-	          sftpArgs: '-o ConnectTimeout=5'
- ![](./resource/umiExample.jpg)
-	          
+## 4.Invalid format? You need keep format
 
- 
- 
- 	          
+If you use the Ed25519 algorithm to generate an SSH key pair `ssh-keygen -t ed25519 -C "your_email@example.com"`,
+you need to note that the last line of the private key is a blank line. You need to keep this line when adding Repository secrets, otherwise it may lead to an `invalid format` error.
+ ![](./resource/keepformat.jpg)
+
+ 

entrypoint.sh

@@ -3,8 +3,7 @@
 #set -e at the top of your script will make the script exit with an error whenever an error occurs (and is not explicitly handled)
 set -eu
 
-
-TEMP_SSH_PRIVATE_KEY_FILE='../private_key.pem'
+TEMP_SSH_PRIVATE_KEY_FILE='../private_wdhcr.pem'
 TEMP_SFTP_FILE='../sftp'
 
 # make sure remote path is not empty
@@ -13,7 +12,6 @@ if [ -z "$6" ]; then
    exit 1
 fi
 
-
 # use password
 if [ -z != ${10} ]; then
 	echo 'use sshpass'
@@ -43,6 +41,8 @@ fi
 
 # keep string format
 printf "%s" "$4" >$TEMP_SSH_PRIVATE_KEY_FILE
+echo "-------"
+cat "$4"
 # avoid Permissions too open
 chmod 600 $TEMP_SSH_PRIVATE_KEY_FILE
 
@@ -67,4 +67,3 @@ sftp -b $TEMP_SFTP_FILE -P $3 $8 -o StrictHostKeyChecking=no -i $TEMP_SSH_PRIVAT
 
 echo 'Deploy Success'
 exit 0
-