use `catthehacker/ubuntu:runner-***` images for default labels
This commit is contained in:
parent
7215df2b59
commit
74d39bb0a5
|
|
@ -69,7 +69,7 @@ Name|Default Value|Description
|
||||||
----|-------------|-----------
|
----|-------------|-----------
|
||||||
GITEA_INSTANCE_INSECURE|`false`|It `true` don't verify the TLS certificate of the Gitea instance
|
GITEA_INSTANCE_INSECURE|`false`|It `true` don't verify the TLS certificate of the Gitea instance
|
||||||
GITEA_RUNNER_NAME|`<empty>`|If not specified the container's hostname is used
|
GITEA_RUNNER_NAME|`<empty>`|If not specified the container's hostname is used
|
||||||
GITEA_RUNNER_LABELS|`<empty>`|Comma-separated list of labels (e.g. `ubuntu-20.04:docker://node:16-bullseye,ubuntu-18.04:docker://node:16-buster,linux_arm:host`) If not specified default labels are used
|
GITEA_RUNNER_LABELS|`<empty>`|Comma-separated list of labels in the format of `label[:schema[:args]]`. If not specified the following labels are used `ubuntu-latest:docker://catthehacker/ubuntu:runner-22.04,ubuntu-22.04:docker://catthehacker/ubuntu:runner-22.04,ubuntu-20.04:docker://catthehacker/ubuntu:runner-20.04`
|
||||||
GITEA_RUNNER_REGISTRATION_FILE|`/data/.runner`|The JSON file that holds the result from the runner registration with the Gitea instance
|
GITEA_RUNNER_REGISTRATION_FILE|`/data/.runner`|The JSON file that holds the result from the runner registration with the Gitea instance
|
||||||
GITEA_RUNNER_REGISTRATION_TIMEOUT|`30`|In case of failure, registration is retried until this timeout in seconds is reached
|
GITEA_RUNNER_REGISTRATION_TIMEOUT|`30`|In case of failure, registration is retried until this timeout in seconds is reached
|
||||||
GITEA_RUNNER_REGISTRATION_RETRY_INTERVAL|`5`|Wait period in seconds between registration retries
|
GITEA_RUNNER_REGISTRATION_RETRY_INTERVAL|`5`|Wait period in seconds between registration retries
|
||||||
|
|
|
||||||
|
|
@ -131,6 +131,10 @@ ENV \
|
||||||
#
|
#
|
||||||
GITEA_RUNNER_NAME='' \
|
GITEA_RUNNER_NAME='' \
|
||||||
GITEA_RUNNER_LABELS='' \
|
GITEA_RUNNER_LABELS='' \
|
||||||
|
GITEA_RUNNER_LABELS_DEFAULT='\
|
||||||
|
ubuntu-latest:docker://catthehacker/ubuntu:runner-22.04,\
|
||||||
|
ubuntu-22.04:docker://catthehacker/ubuntu:runner-22.04,\
|
||||||
|
ubuntu-20.04:docker://catthehacker/ubuntu:runner-20.04' \
|
||||||
GITEA_RUNNER_UID=1000 \
|
GITEA_RUNNER_UID=1000 \
|
||||||
GITEA_RUNNER_GID=1000 \
|
GITEA_RUNNER_GID=1000 \
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -59,6 +59,10 @@ if [[ ! -s .runner ]]; then
|
||||||
read -r GITEA_RUNNER_REGISTRATION_TOKEN < "$GITEA_RUNNER_REGISTRATION_TOKEN_FILE"
|
read -r GITEA_RUNNER_REGISTRATION_TOKEN < "$GITEA_RUNNER_REGISTRATION_TOKEN_FILE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ -z ${GITEA_RUNNER_LABELS:-} ]]; then
|
||||||
|
GITEA_RUNNER_LABELS=$GITEA_RUNNER_LABELS_DEFAULT
|
||||||
|
fi
|
||||||
|
|
||||||
log INFO "Trying to register runner with Gitea..."
|
log INFO "Trying to register runner with Gitea..."
|
||||||
log INFO " GITEA_INSTANCE_URL=$GITEA_INSTANCE_URL"
|
log INFO " GITEA_INSTANCE_URL=$GITEA_INSTANCE_URL"
|
||||||
log INFO " GITEA_RUNNER_NAME=$GITEA_RUNNER_NAME"
|
log INFO " GITEA_RUNNER_NAME=$GITEA_RUNNER_NAME"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue