diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 5b0a5c1df..0f8e5c60d 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -240,21 +240,17 @@ jobs: run: | echo "IMAGE_TAG=${{ needs.build_docker_image_set_env.outputs.image_tag }}" >> $GITHUB_ENV - - name: Build Docker image - run: | - docker buildx bake --load - - name: Login to Docker Hub Registry 🔢 if: github.event_name == 'push' && env.IS_TAG_BUILD == 'true' && github.repository == 'RasaHQ/rasa-sdk' run: echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin || true - - name: Push Docker image 📦 + - name: Build and Push Docker image 📦 if: github.event_name == 'push' && env.IS_TAG_BUILD == 'true' && github.repository == 'RasaHQ/rasa-sdk' run: | IS_NEWEST_VERSION=${{ needs.build_docker_image_set_env.outputs.is_newest_version }} # Push image - docker push rasa/rasa-sdk:${IMAGE_TAG} + IMAGE_TAG=${IMAGE_TAG} docker buildx bake --set *.platform=linux/amd64,linux/arm64 -f docker-bake.hcl default --push # Tag the image as latest if [[ "${IS_NEWEST_VERSION}" == "true" ]]; then diff --git a/.github/workflows/rasa-sdk-dev-docker-image.yml b/.github/workflows/rasa-sdk-dev-docker-image.yml index a6fb5ca19..49ffb5f4f 100644 --- a/.github/workflows/rasa-sdk-dev-docker-image.yml +++ b/.github/workflows/rasa-sdk-dev-docker-image.yml @@ -5,6 +5,7 @@ on: # Run cron job at 8AM Monday to Sunday. - cron: '0 8 * * *' workflow_dispatch: + pull_request: env: AWS_REGION: us-east-1 @@ -48,13 +49,7 @@ jobs: uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c with: version: v0.5.1 - driver: docker - - name: Build docker image + - name: Build and push docker image to AWS run: | - docker buildx bake --load - - - name: Tag and push docker image to AWS - run: | - docker tag rasa/rasa-sdk:main $REPOSITORY:latest - docker push $REPOSITORY:latest + docker buildx bake --set *.platform=linux/amd64,linux/arm64 --set default.tags=$REPOSITORY:latest --push diff --git a/changelog/1123.misc.md b/changelog/1123.misc.md new file mode 100644 index 000000000..8ad9b5840 --- /dev/null +++ b/changelog/1123.misc.md @@ -0,0 +1 @@ +Add support for ARM architecture in the `rasa-sdk` Docker image build.