mirror of
https://github.com/atmoz/sftp.git
synced 2024-11-17 12:51:33 -05:00
--no-cache build option by default
This commit is contained in:
parent
0549dfa4af
commit
bfe3c13470
2 changed files with 10 additions and 7 deletions
|
@ -1 +1 @@
|
||||||
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHDDQw9a9miGWDEXLG9mMR7OuV3ufmkgm5htntuZnxRw1sUfySmgeaY5ZDvHw5uEMulxYS/yJ+hLxFgsj3tUwIlwRz9yRyrzZm+gBE4Xhsb+NhdaMQdFnMSn3cUw8UHO8FmRd4FLiSx32x+pF83JnNR67+3fzSg2wKmvz5OdoQSELn4TpRuOt4fQI+22QPRpGOuzN6vWGQazY/LzRVlKeJ1kasVE1p/GKCNwtE2nhkk3B4VzuZy4sh8Fqklcgka6PZcDGu3zqkFCgRJ9oRODSbcNaXhnXDrBlnbpaciJU4d2JdyPdTS11nAKLE+KEfnJhjLLp8TXWQzD2xB2HH7gEd atmoz@arch-book
|
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHDDQw9a9miGWDEXLG9mMR7OuV3ufmkgm5htntuZnxRw1sUfySmgeaY5ZDvHw5uEMulxYS/yJ+hLxFgsj3tUwIlwRz9yRyrzZm+gBE4Xhsb+NhdaMQdFnMSn3cUw8UHO8FmRd4FLiSx32x+pF83JnNR67+3fzSg2wKmvz5OdoQSELn4TpRuOt4fQI+22QPRpGOuzN6vWGQazY/LzRVlKeJ1kasVE1p/GKCNwtE2nhkk3B4VzuZy4sh8Fqklcgka6PZcDGu3zqkFCgRJ9oRODSbcNaXhnXDrBlnbpaciJU4d2JdyPdTS11nAKLE+KEfnJhjLLp8TXWQzD2xB2HH7gEd test
|
||||||
|
|
|
@ -19,16 +19,20 @@ else
|
||||||
redirect="/dev/stdout"
|
redirect="/dev/stdout"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
buildOptions="--tag $sftpImageName"
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
function beforeTest() {
|
function beforeTest() {
|
||||||
if [ "$build" == "build" ]; then
|
if [ "$build" == "build" ]; then
|
||||||
docker build --pull=true --tag "$sftpImageName" "$buildDir"
|
buildOptions="$buildOptions --no-cache --pull=true"
|
||||||
|
fi
|
||||||
|
|
||||||
|
docker build $buildOptions "$buildDir"
|
||||||
if [ $? -gt 0 ]; then
|
if [ $? -gt 0 ]; then
|
||||||
echo "Build failed"
|
echo "Build failed"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# Private key can not be read by others
|
# Private key can not be read by others
|
||||||
chmod go-rw "$scriptDir/id_rsa"
|
chmod go-rw "$scriptDir/id_rsa"
|
||||||
|
@ -81,7 +85,6 @@ function runSftpCommands() {
|
||||||
-b - $user@$ip \
|
-b - $user@$ip \
|
||||||
> "$redirect" 2>&1
|
> "$redirect" 2>&1
|
||||||
|
|
||||||
sleep 1 # wait for command to finish
|
|
||||||
}
|
}
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
Loading…
Reference in a new issue