From f956c3543f7ec0b0f91f1fb4b057f296ed8028ea Mon Sep 17 00:00:00 2001 From: Chevdor <chevdor@users.noreply.github.com> Date: Mon, 28 Mar 2022 09:50:29 +0200 Subject: [PATCH] Fix build script for the builder image (#5189) fix #4743 --- polkadot/scripts/dockerfiles/polkadot/build.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/polkadot/scripts/dockerfiles/polkadot/build.sh b/polkadot/scripts/dockerfiles/polkadot/build.sh index cf100bedbfa..c32c20d9cea 100755 --- a/polkadot/scripts/dockerfiles/polkadot/build.sh +++ b/polkadot/scripts/dockerfiles/polkadot/build.sh @@ -8,17 +8,20 @@ PROJECT_ROOT=`git rev-parse --show-toplevel` cd $PROJECT_ROOT # Find the current version from Cargo.toml -VERSION=`grep "^version" ./cli/Cargo.toml | egrep -o "([0-9\.]+)"` +VERSION=`grep "^version" ./cli/Cargo.toml | egrep -o "([0-9\.]+-?[0-9]+)"` GITUSER=parity GITREPO=polkadot # Build the image echo "Building ${GITUSER}/${GITREPO}:latest docker image, hang on!" -time docker build -f ./scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile -t ${GITUSER}/${GITREPO}:latest . -docker tag ${GITUSER}/${GITREPO}:latest ${GITUSER}/${GITREPO}:v${VERSION} +time docker build \ + -f ./scripts/dockerfiles/polkadot/polkadot_builder.Dockerfile \ + -t ${GITUSER}/${GITREPO}:latest \ + -t ${GITUSER}/${GITREPO}:v${VERSION} \ + . # Show the list of available images for this repo -echo "Image is ready" +echo "Your Docker image for $GITUSER/$GITREPO is ready" docker images | grep ${GITREPO} popd -- GitLab