diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml index 13fc9bd19b27..8813c17b9006 100644 --- a/.github/workflows/continous-integration.yml +++ b/.github/workflows/continous-integration.yml @@ -906,7 +906,7 @@ jobs: # Base MITIE image BASE_MITIE_IMAGE_HASH=${{ hashFiles('docker/Dockerfile.base-mitie') }} MAKEFILE_MITIE_HASH=${{ hashFiles('Makefile') }} - echo "base_mitie_image_hash=${BASE_MITIE_IMAGE_HASH:0:50}-${MAKEFILE_MITIE_HASH:0:50}" >> $GITHUB_OUTPUT + echo "base_mitie_image_hash=${BASE_MITIE_IMAGE_HASH}" >> $GITHUB_OUTPUT BASE_IMAGE_MITIE_EXISTS=$((docker manifest inspect rasa/rasa:base-mitie-${BASE_MITIE_IMAGE_HASH:0:50}-${MAKEFILE_MITIE_HASH:0:50} &> /dev/null && echo true || echo false) || true) echo "base_mitie_exists=${BASE_IMAGE_MITIE_EXISTS}" >> $GITHUB_OUTPUT @@ -1095,8 +1095,6 @@ jobs: IS_NEWEST_VERSION=${{ needs.build_docker_base_images_and_set_env.outputs.is_newest_version }} docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --push - docker buildx bake --set *.platform=linux/amd64 -f docker/docker-bake.hcl ${{ matrix.image }} --load - docker buildx bake --set *.platform=linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --load # Tag the image as latest if [[ "${IS_NEWEST_VERSION}" == "true" ]]; then @@ -1107,9 +1105,11 @@ jobs: fi LATEST_TAG=$(echo $RELEASE_TAG | sed 's/'$IMAGE_TAG'/latest/g') - - docker tag rasa/rasa:${RELEASE_TAG} rasa/rasa:${LATEST_TAG} - docker push rasa/rasa:${LATEST_TAG} + + # This will not build the image from ground up, but will only tag the existing image with LATEST_TAG + IMAGE_TAG=${LATEST_TAG} docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} + # Push tagged image + IMAGE_TAG=${LATEST_TAG} docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker/docker-bake.hcl ${{ matrix.image }} --push fi deploy: diff --git a/3.7.0b1/main_plain/.config/rasa/global.yml b/3.7.0b1/main_plain/.config/rasa/global.yml new file mode 100644 index 000000000000..c5dcee2da8c9 --- /dev/null +++ b/3.7.0b1/main_plain/.config/rasa/global.yml @@ -0,0 +1,4 @@ +metrics: + enabled: true + rasa_user_id: 003ff8fbd6e04031b5597b37356022d4 + date: 2023-09-12 13:20:59.423434 diff --git a/docs/docs/sources/rasa_interactive___help.txt b/docs/docs/sources/rasa_interactive___help.txt index 109bece32274..36648e09e2c8 100644 --- a/docs/docs/sources/rasa_interactive___help.txt +++ b/docs/docs/sources/rasa_interactive___help.txt @@ -39,7 +39,7 @@ options: --conversation-id CONVERSATION_ID Specify the id of the conversation the messages are in. Defaults to a UUID that will be randomly - generated. (default: b577fd9d1b024015822a7acdc5fc7082) + generated. (default: 38f886f1d51f4930a022dacf9380ba41) --endpoints ENDPOINTS Configuration file for the model server and the connectors as a yml file. (default: endpoints.yml) diff --git a/docs/docs/sources/rasa_shell___help.txt b/docs/docs/sources/rasa_shell___help.txt index 6138cce53ce2..922d0ce94d45 100644 --- a/docs/docs/sources/rasa_shell___help.txt +++ b/docs/docs/sources/rasa_shell___help.txt @@ -30,7 +30,7 @@ options: -h, --help show this help message and exit --conversation-id CONVERSATION_ID Set the conversation ID. (default: - 953d22fd1fae40fa8fcec9ba1b9ac70d) + 6df409f874c04c1ab6a76af9a9a79760) -m MODEL, --model MODEL Path to a trained Rasa model. If a directory is specified, it will use the latest model in this