diff --git a/.cicd/docker-tag.sh b/.cicd/docker-tag.sh index 22da25dff..961efaba9 100755 --- a/.cicd/docker-tag.sh +++ b/.cicd/docker-tag.sh @@ -4,8 +4,8 @@ echo '+++ :evergreen_tree: Configuring Environment' REPO='eosio/ci-contracts-builder' PREFIX='base-ubuntu-18.04' IMAGE="$REPO:$PREFIX-$BUILDKITE_COMMIT-$PLATFORM_TYPE" -SANITIZED_BRANCH=$(echo "$BUILDKITE_BRANCH" | tr '/' '_') -SANITIZED_TAG=$(echo "$BUILDKITE_TAG" | tr '/' '_') +SANITIZED_BRANCH=$(echo "$BUILDKITE_BRANCH" | sed 's.^/..' | tr '/' '_') +SANITIZED_TAG=$(echo "$BUILDKITE_TAG" | sed 's.^/..' | tr '/' '_') echo '+++ :arrow_down: Pulling Container' echo "Pulling \"$IMAGE\"" docker pull "$IMAGE" diff --git a/.cicd/installation-build.sh b/.cicd/installation-build.sh index ee6f52ad8..cee789678 100755 --- a/.cicd/installation-build.sh +++ b/.cicd/installation-build.sh @@ -2,7 +2,7 @@ set -eo pipefail . ./.cicd/helpers/general.sh export ENABLE_INSTALL=true -export BRANCH=$(echo $BUILDKITE_BRANCH | tr '/' '_') +export BRANCH=$(echo $BUILDKITE_BRANCH | sed 's.^/..' | tr '/' '_') export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04" export ARGS="--name ci-contracts-builder-$BUILDKITE_PIPELINE_SLUG-$BUILDKITE_BUILD_NUMBER --init -v $(pwd):$MOUNTED_DIR" $CICD_DIR/build.sh