diff --git a/Dockerfile b/Dockerfile index 83666f5..145c391 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 +FROM alpine:3.11 COPY LICENSE README.md / diff --git a/LICENSE b/LICENSE index a576e9d..c371d5f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 Sebastian Popp +Copyright (c) 2020 Sebastian Popp and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 2ac3687..50c4a78 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,16 @@ jobs: name: Deploy runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 - name: Upload ftp - uses: sebastianpopp/ftp-action@releases/v1 + uses: sebastianpopp/ftp-action@releases/v2 with: host: ${{ secrets.FTP_SERVER }} user: ${{ secrets.FTP_USERNAME }} password: ${{ secrets.FTP_PASSWORD }} localDir: "dist" remoteDir: "www" + options: "--delete --asci" ``` ## Input parameters @@ -32,3 +33,5 @@ user | FTP username | Yes | N/A password | FTP password | Yes | N/A localDir | The local directory to copy | No | . remoteDir | The remote directory to copy to | No | . +forceSsl | Force SSL encryption | No | false +options | Mirror command options | No | '' diff --git a/action.yml b/action.yml index 903df30..6d362cb 100644 --- a/action.yml +++ b/action.yml @@ -11,6 +11,10 @@ inputs: password: description: 'FTP password' required: true + forceSsl: + description: 'Force SSL encryption' + required: false + default: 'false' localDir: description: 'Local directory' required: false @@ -19,6 +23,10 @@ inputs: description: 'Remote directory' required: false default: '.' + options: + description: 'Additional mirror command options' + required: false + default: '' runs: using: 'docker' image: 'Dockerfile' diff --git a/entrypoint.sh b/entrypoint.sh index d134a62..45331f7 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,3 +1,3 @@ #!/bin/sh -l -lftp $INPUT_HOST -u $INPUT_USER,$INPUT_PASSWORD -e "set ssl:verify-certificate false; mirror --reverse --continue --dereference -x ^\.git/$ $INPUT_LOCALDIR $INPUT_REMOTEDIR; quit" +lftp $INPUT_HOST -u $INPUT_USER,$INPUT_PASSWORD -e "set ftp:ssl-force $INPUT_FORCESSL; set ssl:verify-certificate false; mirror $INPUT_OPTIONS --reverse --continue --dereference -x ^\.git/$ $INPUT_LOCALDIR $INPUT_REMOTEDIR; quit"