fix: Remove duplicate registry validation code
- Remove duplicate ACTUAL_REGISTRY validation logic - Ensure REGISTRY_TO_USE is properly set before docker build - Fix invalid tag format error by using consistent variable
This commit is contained in:
@@ -457,26 +457,43 @@ jobs:
|
||||
run: |
|
||||
cd /workspace/repo
|
||||
|
||||
# Fallback falls ACTUAL_REGISTRY nicht gesetzt wurde
|
||||
if [ -z "$ACTUAL_REGISTRY" ] || [ "$ACTUAL_REGISTRY" = "/" ] || [ "$ACTUAL_REGISTRY" = "" ]; then
|
||||
echo "⚠️ ACTUAL_REGISTRY nicht gesetzt oder leer, verwende Fallback: ${{ env.REGISTRY }}"
|
||||
ACTUAL_REGISTRY="${{ env.REGISTRY }}"
|
||||
fi
|
||||
|
||||
# Entferne führende/trailing Slashes aus ACTUAL_REGISTRY
|
||||
ACTUAL_REGISTRY=$(echo "$ACTUAL_REGISTRY" | sed 's|^/||' | sed 's|/$||')
|
||||
|
||||
# Validierung: Stelle sicher, dass ACTUAL_REGISTRY nicht leer ist
|
||||
if [ -z "$ACTUAL_REGISTRY" ]; then
|
||||
echo "❌ Fehler: ACTUAL_REGISTRY ist leer! Kann kein Image bauen."
|
||||
echo "REGISTRY env: ${{ env.REGISTRY }}"
|
||||
echo "ACTUAL_REGISTRY env: ${{ env.ACTUAL_REGISTRY }}"
|
||||
# Bestimme die zu verwendende Registry (setze REGISTRY_TO_USE)
|
||||
if [ -n "$ACTUAL_REGISTRY" ] && [ "$ACTUAL_REGISTRY" != "/" ]; then
|
||||
REGISTRY_TO_USE="$ACTUAL_REGISTRY"
|
||||
echo "✅ Verwende ACTUAL_REGISTRY: $REGISTRY_TO_USE"
|
||||
elif [ -n "$FALLBACK_REGISTRY" ] && [ "$FALLBACK_REGISTRY" != "/" ]; then
|
||||
REGISTRY_TO_USE="$FALLBACK_REGISTRY"
|
||||
echo "⚠️ ACTUAL_REGISTRY leer, verwende FALLBACK_REGISTRY: $REGISTRY_TO_USE"
|
||||
else
|
||||
echo "❌ Fehler: Weder ACTUAL_REGISTRY noch REGISTRY sind gesetzt!"
|
||||
echo "ACTUAL_REGISTRY: '${ACTUAL_REGISTRY}'"
|
||||
echo "FALLBACK_REGISTRY: '${FALLBACK_REGISTRY}'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "📦 Verwendete Registry für Build: $ACTUAL_REGISTRY"
|
||||
echo "📝 Image Name: ${{ env.IMAGE_NAME }}"
|
||||
echo "🏷️ Vollständiger Image-Pfad: ${ACTUAL_REGISTRY}/${{ env.IMAGE_NAME }}:latest"
|
||||
# Entferne führende/trailing Slashes und Leerzeichen
|
||||
REGISTRY_TO_USE=$(echo "$REGISTRY_TO_USE" | sed 's|^[/ ]*||' | sed 's|[/ ]*$||' | tr -d '[:space:]')
|
||||
|
||||
# Validierung: Stelle sicher, dass REGISTRY_TO_USE nicht leer ist
|
||||
if [ -z "$REGISTRY_TO_USE" ] || [ "$REGISTRY_TO_USE" = "/" ]; then
|
||||
echo "❌ Fehler: REGISTRY_TO_USE ist leer oder ungültig: '$REGISTRY_TO_USE'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Validiere dass der Image-Name nicht leer ist
|
||||
IMAGE_NAME="${{ env.IMAGE_NAME }}"
|
||||
if [ -z "$IMAGE_NAME" ]; then
|
||||
echo "❌ Fehler: IMAGE_NAME ist leer!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "📦 Finale Registry für Build: $REGISTRY_TO_USE"
|
||||
echo "📝 Image Name: $IMAGE_NAME"
|
||||
echo "🏷️ Vollständiger Image-Pfad: ${REGISTRY_TO_USE}/${IMAGE_NAME}:latest"
|
||||
|
||||
# Test: Zeige die exakten Docker-Tags die verwendet werden
|
||||
echo "🔖 Docker Tags:"
|
||||
echo " - ${REGISTRY_TO_USE}/${IMAGE_NAME}:latest"
|
||||
|
||||
COMMIT_SHA="${{ github.sha }}"
|
||||
if [ -z "$COMMIT_SHA" ]; then
|
||||
|
||||
Reference in New Issue
Block a user