diff --git a/.github/workflows/docker-build-backend-container-on-merge-group.yml b/.github/workflows/docker-build-backend-container-on-merge-group.yml deleted file mode 100644 index 5c474ef7f..000000000 --- a/.github/workflows/docker-build-backend-container-on-merge-group.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Build Backend Image on Merge Group - -on: - merge_group: - types: [checks_requested] - -env: - REGISTRY_IMAGE: danswer/danswer-backend - -jobs: - build: - # TODO: make this a matrix build like the web containers - runs-on: - group: amd64-image-builders - - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Backend Image Docker Build - uses: docker/build-push-action@v5 - with: - context: ./backend - file: ./backend/Dockerfile - platforms: linux/amd64,linux/arm64 - push: false - tags: | - ${{ env.REGISTRY_IMAGE }}:latest - build-args: | - DANSWER_VERSION=v0.0.1 diff --git a/.github/workflows/docker-build-web-container-on-merge-group.yml b/.github/workflows/docker-build-web-container-on-merge-group.yml deleted file mode 100644 index 9a59085e8..000000000 --- a/.github/workflows/docker-build-web-container-on-merge-group.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Build Web Image on Merge Group - -on: - merge_group: - types: [checks_requested] - -env: - REGISTRY_IMAGE: danswer/danswer-web-server - -jobs: - build: - runs-on: - group: ${{ matrix.platform == 'linux/amd64' && 'amd64-image-builders' || 'arm64-image-builders' }} - strategy: - fail-fast: false - matrix: - platform: - - linux/amd64 - - linux/arm64 - - steps: - - name: Prepare - run: | - platform=${{ matrix.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - - name: Checkout - uses: actions/checkout@v4 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY_IMAGE }} - tags: | - type=raw,value=${{ env.REGISTRY_IMAGE }}:latest - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build by digest - id: build - uses: docker/build-push-action@v5 - with: - context: ./web - file: ./web/Dockerfile - platforms: ${{ matrix.platform }} - push: false - build-args: | - DANSWER_VERSION=v0.0.1 - # needed due to weird interactions with the builds for different platforms - no-cache: true - labels: ${{ steps.meta.outputs.labels }}