Bugfix
01_container_build.sh: now identifies GIT, OWNER and REPO DotDockerbuilder10.sh: Added debug msg
This commit is contained in:
@@ -4,18 +4,31 @@ echo "USER: $UID"
|
|||||||
|
|
||||||
# Parse owner/repo from GIT_URL
|
# Parse owner/repo from GIT_URL
|
||||||
: "${GIT_URL:?Missing GIT_URL in Jenkins env}"
|
: "${GIT_URL:?Missing GIT_URL in Jenkins env}"
|
||||||
|
# GIT_URL="https://gitea.a.ucnit.eu/DMA-CSD-CICD/Test01.git"
|
||||||
# Handle formats: https://gitea.example.com/owner/repo.git or git@gitea.example.com:owner/repo.git
|
# Handle formats: https://gitea.example.com/owner/repo.git or git@gitea.example.com:owner/repo.git
|
||||||
OWNER=""
|
OWNER=""
|
||||||
REPO=""
|
REPO=""
|
||||||
if [[ "$GIT_URL" =~ [:\/]([^\/:]+)\/([^\/\.]+)(\.git)?$ ]]; then
|
GIT=""
|
||||||
OWNER="${BASH_REMATCH[1]}"
|
if echo "$GIT_URL" | grep -q "^http"; then
|
||||||
REPO="${BASH_REMATCH[2]}"
|
GIT=$(echo "$GIT_URL" | cut -f 3 -d '/')
|
||||||
|
OWNER=$(echo "$GIT_URL" | cut -f 4 -d '/')
|
||||||
|
REPO=$(echo "$GIT_URL" | cut -f 5 -d '/' | xargs -- basename -s .git)
|
||||||
fi
|
fi
|
||||||
|
if echo "$GIT_URL" | grep -q "^git@"; then
|
||||||
|
GIT=$(echo "$GIT_URL" | cut -f 2 -d '@' | cut -f 1 -d ':')
|
||||||
|
OWNER=$(echo "$GIT_URL" | cut -f 2 -d ':' | cut -f 1 -d '/')
|
||||||
|
REPO=$(echo "$GIT_URL" | cut -f 2 -d '/' | xargs -- basename -s .git)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# if [[ "$GIT_URL" =~ [:\/]([^\/:]+)\/([^\/\.]+)(\.git)?$ ]]; then
|
||||||
|
# OWNER="${BASH_REMATCH[1]}"
|
||||||
|
# REPO="${BASH_REMATCH[2]}"
|
||||||
|
# fi
|
||||||
if [[ -z "$OWNER" || -z "$REPO" ]]; then
|
if [[ -z "$OWNER" || -z "$REPO" ]]; then
|
||||||
echo "[ERROR] Could not determine owner/repo from GIT_URL=$GIT_URL"
|
echo "[ERROR] Could not determine owner/repo from GIT_URL=$GIT_URL"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "Will publish package at [$OWNER]"
|
echo "Will publish package at [$REPO]/[$OWNER]"
|
||||||
|
|
||||||
echo "Will build:"
|
echo "Will build:"
|
||||||
/bin/find ./ -type f -name "*.csproj" | while read line; do
|
/bin/find ./ -type f -name "*.csproj" | while read line; do
|
||||||
@@ -29,6 +42,6 @@ done
|
|||||||
solution=$(echo "$line" | cut -f 2 -d '/')
|
solution=$(echo "$line" | cut -f 2 -d '/')
|
||||||
project=$(echo "$line" | cut -f 3 -d '/')
|
project=$(echo "$line" | cut -f 3 -d '/')
|
||||||
echo "Building [$solution] [$project]"
|
echo "Building [$solution] [$project]"
|
||||||
.workflow/DotDockerbuilder10.sh --solution $solution --project $project --gituser $OWNER
|
.workflow/DotDockerbuilder10.sh --solution $solution --project $project --git $GIT --gituser $OWNER
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@@ -199,6 +199,8 @@ if [ -n "$Git" ]; then
|
|||||||
echo "Cleaning up: [$tagName:latest] [$CONTAINERNAME:latest] [$CONTAINERNAME:$(date +%y%m%d)]"
|
echo "Cleaning up: [$tagName:latest] [$CONTAINERNAME:latest] [$CONTAINERNAME:$(date +%y%m%d)]"
|
||||||
sudo docker image rm $tagName:latest
|
sudo docker image rm $tagName:latest
|
||||||
sudo docker image rm $CONTAINERNAME:latest $CONTAINERNAME:$(date +%y%m%d)
|
sudo docker image rm $CONTAINERNAME:latest $CONTAINERNAME:$(date +%y%m%d)
|
||||||
|
else
|
||||||
|
echo "Not pushing to package repository as Git[$Git] or GitUser[$GitUser] is blank"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo docker image prune --force
|
sudo docker image prune --force
|
||||||
|
|||||||
Reference in New Issue
Block a user