fix function build_image
This commit is contained in:
@@ -639,10 +639,8 @@ build_image() {
|
||||
|
||||
# Tags vorbereiten
|
||||
local tags=()
|
||||
IFS=',' read -ra regs <<< "$registry"
|
||||
for reg in "${regs[@]}"; do
|
||||
local url
|
||||
url=$(jq -r '.url' "$CONFIG_DIR/registries/$reg/config-file")
|
||||
source "$CONFIG_DIR/registries/$reg/config-file"
|
||||
tags+=("-t" "${url}/${image_name}:${version}")
|
||||
[[ "$latest" == "yes" ]] && tags+=("-t" "${url}/${image_name}:latest")
|
||||
done
|
||||
@@ -651,9 +649,9 @@ build_image() {
|
||||
if [[ "$push" == "yes" ]]; then
|
||||
for reg in "${regs[@]}"; do
|
||||
local url username password
|
||||
url=$(jq -r '.url' "$CONFIG_DIR/registries/$reg/config-file")
|
||||
username=$(jq -r '.username // ""' "$CONFIG_DIR/registries/$reg/config-file")
|
||||
password=$(jq -r '.password // ""' "$CONFIG_DIR/registries/$reg/config-file")
|
||||
# key=value Datei einlesen
|
||||
source "$CONFIG_DIR/registries/$reg/config-file"
|
||||
# url, username, password stehen jetzt als Variablen zur Verfügung
|
||||
if [[ -n "$username" && -n "$password" ]]; then
|
||||
docker login "$url" -u "$username" -p "$password" &>> "$logfile"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user