Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow configuring a registry login #61

Merged
merged 1 commit into from
Jan 12, 2022
Merged

Allow configuring a registry login #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ A Docker swarm service for automatically updating your services whenever their b
mazzolino/shepherd

## Or with docker-compose

version: "3"
services:
...
Expand All @@ -36,6 +37,8 @@ Alternatively you can specify a filter for the services you want updated using t

You can enable private registry authentication by setting the `WITH_REGISTRY_AUTH` variable.

If you need to authenticate to a registry (for example in order to get around the [Docker Hub rate limits](https://www.docker.com/increase-rate-limit)), you can set the variables `REGISTRY_USER` and `REGISTRY_PASSWORD`. If you are not using Docker Hub but a private registry, set `REGISTRY_HOST` to the hostname of your registry.

You can enable connection to insecure private registry by setting the `WITH_INSECURE_REGISTRY` variable.

You can force image deployment whatever the architecture by setting the `WITH_NO_RESOLVE_IMAGE` variable.
Expand Down
23 changes: 21 additions & 2 deletions shepherd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ update_services() {
local supports_insecure_registry=$4
local supports_no_resolve_image=$5
local image_autoclean_limit=$6
local registry_user="$7"
local registry_password="$8"
local registry_host="$9"
local detach_option=""
local registry_auth=""
local insecure_registry_flag=""
Expand All @@ -33,6 +36,11 @@ update_services() {
[ $supports_insecure_registry = true ] && insecure_registry_flag="--insecure"
[ $supports_no_resolve_image = true ] && no_resolve_image_flag="--no-resolve-image"

if [[ -n "$registry_user" ]]; then
logger "Trying to login into registry $registry_host"
echo "$registry_password" | docker login --username="$registry_user" --password-stdin "$registry_host"
fi

for name in $(IFS=$'\n' docker service ls --quiet --filter "${FILTER_SERVICES}" --format '{{.Name}}'); do
local image_with_digest image
if [[ " $ignorelist " != *" $name "* ]]; then
Expand Down Expand Up @@ -76,6 +84,9 @@ update_services() {

main() {
local sleep_time supports_detach_option supports_registry_auth tz verbose image_autoclean_limit ignorelist
local registry_user=""
local registry_password=""
local registry_host=""
ignorelist="${IGNORELIST_SERVICES:-}"
sleep_time="${SLEEP_TIME:-5m}"
verbose="${VERBOSE:-true}"
Expand All @@ -90,6 +101,14 @@ main() {
fi

supports_registry_auth=false
if [[ ${REGISTRY_USER+x} ]]; then
supports_registry_auth=true
registry_user="${REGISTRY_USER}"
registry_password="${REGISTRY_PASSWORD}"
registry_host="${REGISTRY_HOST:-}"
logger "Send given registry authentication details to swarm agents"
fi

if [[ ${WITH_REGISTRY_AUTH+x} ]]; then
supports_registry_auth=true
logger "Send registry authentication details to swarm agents"
Expand All @@ -110,10 +129,10 @@ main() {
[[ "$ignorelist" != "" ]] && logger "Excluding services: $ignorelist"

if [[ ${RUN_ONCE_AND_EXIT+x} ]]; then
update_services "$ignorelist" "$supports_detach_option" "$supports_registry_auth" "$supports_insecure_registry" "$supports_no_resolve_image" "$image_autoclean_limit"
update_services "$ignorelist" "$supports_detach_option" "$supports_registry_auth" "$supports_insecure_registry" "$supports_no_resolve_image" "$image_autoclean_limit" "$registry_user" "$registry_password" "$registry_host"
else
while true; do
update_services "$ignorelist" "$supports_detach_option" "$supports_registry_auth" "$supports_insecure_registry" "$supports_no_resolve_image" "$image_autoclean_limit"
update_services "$ignorelist" "$supports_detach_option" "$supports_registry_auth" "$supports_insecure_registry" "$supports_no_resolve_image" "$image_autoclean_limit" "$registry_user" "$registry_password" "$registry_host"
logger "Sleeping $sleep_time before next update" "true"
sleep "$sleep_time"
done
Expand Down