mirror of
https://github.com/m8tin/cis.git
synced 2025-12-06 07:48:26 +01:00
pull first to handle repo updates from others and stop container after 10m if it is in fail state.
This commit is contained in:
@@ -56,6 +56,7 @@ function ensureRepositoryIsAvailableAndWritable() {
|
|||||||
|
|
||||||
[ -d "${_REPOSITORY_FOLDER}.git" ] \
|
[ -d "${_REPOSITORY_FOLDER}.git" ] \
|
||||||
&& echo \
|
&& echo \
|
||||||
|
&& git -C "${_REPOSITORY_FOLDER}" pull &> /dev/null \
|
||||||
&& git -C "${_REPOSITORY_FOLDER}" push --dry-run &> /dev/null \
|
&& git -C "${_REPOSITORY_FOLDER}" push --dry-run &> /dev/null \
|
||||||
&& echo "Writable repository found in folder '${_REPOSITORY_FOLDER}'." \
|
&& echo "Writable repository found in folder '${_REPOSITORY_FOLDER}'." \
|
||||||
&& return 0
|
&& return 0
|
||||||
@@ -95,7 +96,7 @@ function prepareThisRuntimeForUsingGitOrIgnore() {
|
|||||||
&& return 0
|
&& return 0
|
||||||
|
|
||||||
echo "No job will run inside this container because there is an issue."
|
echo "No job will run inside this container because there is an issue."
|
||||||
echo "The container keeps running, please check your setup..."
|
echo "The container keeps running for 10min, please check your setup..."
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,7 +118,7 @@ echo > /autoACME.log
|
|||||||
|
|
||||||
# Generate SSH keys and setup Git if a repository is specified, on failure keep the container running
|
# Generate SSH keys and setup Git if a repository is specified, on failure keep the container running
|
||||||
prepareThisRuntimeForUsingGitOrIgnore \
|
prepareThisRuntimeForUsingGitOrIgnore \
|
||||||
|| tail -f /autoACME.log
|
|| timeout --preserve-status 10m tail -f /autoACME.log
|
||||||
|
|
||||||
# Ensure acme.sh ist installed
|
# Ensure acme.sh ist installed
|
||||||
/renewCerts.sh --setup >> /autoACME.log \
|
/renewCerts.sh --setup >> /autoACME.log \
|
||||||
|
|||||||
Reference in New Issue
Block a user