Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions tag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ for dir in ${VERSIONS}; do
pushd "${dir}" > /dev/null
IMAGE_ID=$(cat .image-id)
name=$(docker inspect -f "{{.Config.Labels.name}}" "$IMAGE_ID")
version=$(docker inspect -f "{{.Config.Labels.version}}" "$IMAGE_ID")
# We need to check '.git' dir in root directory
if [ -d "../.git" ] ; then
commit_date=$(git show -s HEAD --format=%cd --date=short | sed 's/-//g')
Expand All @@ -42,10 +41,10 @@ for dir in ${VERSIONS}; do
fi

full_reg_name="$REGISTRY$name"
echo "-> Tagging image '$IMAGE_ID' as '$full_reg_name:$version' and '$full_reg_name:latest' and '$full_reg_name:$OS' and '$full_reg_name:$date_and_hash'"
echo "-> Tagging image '$IMAGE_ID' as '$full_reg_name:$dir' and '$full_reg_name:latest' and '$full_reg_name:$OS' and '$full_reg_name:$date_and_hash'"

docker tag "$IMAGE_ID" "$full_reg_name:$OS"
docker tag "$IMAGE_ID" "$full_reg_name:$version"
docker tag "$IMAGE_ID" "$full_reg_name:$dir"
docker tag "$IMAGE_ID" "$full_reg_name:latest"
docker tag "$IMAGE_ID" "$full_reg_name:$date_and_hash"

Expand Down
3 changes: 1 addition & 2 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@ for dir in ${VERSIONS}; do
pushd "${dir}" > /dev/null || exit 1
IMAGE_ID=$(cat .image-id)
export IMAGE_ID
IMAGE_VERSION=$(docker inspect -f "{{.Config.Labels.version}}" "$IMAGE_ID")
# Kept also IMAGE_NAME as some tests might still use that.
IMAGE_NAME="$(docker inspect -f "{{.Config.Labels.name}}" "$IMAGE_ID"):$IMAGE_VERSION"
IMAGE_NAME="$(docker inspect -f "{{.Config.Labels.name}}" "$IMAGE_ID"):$dir"
# shellcheck disable=SC2268
if [ "${OS}" == "c9s" ] || [ "${OS}" == "c10s" ] || [ "${OS}" == "fedora" ]; then
export IMAGE_NAME="$REGISTRY$IMAGE_NAME"
Expand Down