forked from open-telemetry/opentelemetry-demo
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/upstream/main'
# Conflicts: # src/frontend/package-lock.json # src/frontend/package.json # src/frontend/pages/_app.tsx
- Loading branch information
Showing
59 changed files
with
1,483 additions
and
1,443 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # DO NOT PUSH CHANGES OF THIS FILE TO opentelemetry/opentelemetry-demo | ||
| # PLACE YOUR .env ENVIRONMENT VARIABLES OVERRIDES IN THIS FILE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,174 +1,14 @@ | ||
| # Copyright The OpenTelemetry Authors | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
| name: Test image generation | ||
|
|
||
| on: | ||
| push: | ||
| paths: | ||
| - 'src/**' | ||
| - 'test/**' | ||
| workflow_call: | ||
| inputs: | ||
| push: | ||
| description: Should the images be pushed | ||
| default: false | ||
| required: false | ||
| type: boolean | ||
| version: | ||
| description: The version used when tagging the image | ||
| default: 'dev' | ||
| required: false | ||
| type: string | ||
|
|
||
| jobs: | ||
| build_and_push_images: | ||
| build_images: | ||
| if: github.repository == 'open-telemetry/opentelemetry-demo' | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
|
|
||
| env: | ||
| RELEASE_VERSION: "${{ github.event.release.tag_name }}" | ||
| DOCKERHUB_REPO: "otel/demo" | ||
| GHCR_REPO: "ghcr.io/open-telemetry/demo" | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| file_tag: | ||
| - file: ./src/accountingservice/Dockerfile | ||
| tag_suffix: accountingservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/adservice/Dockerfile | ||
| tag_suffix: adservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/cartservice/src/Dockerfile | ||
| tag_suffix: cartservice | ||
| context: ./ | ||
| setup-qemu: false | ||
| - file: ./src/checkoutservice/Dockerfile | ||
| tag_suffix: checkoutservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/currencyservice/Dockerfile | ||
| tag_suffix: currencyservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/emailservice/Dockerfile | ||
| tag_suffix: emailservice | ||
| context: ./src/emailservice | ||
| setup-qemu: true | ||
| - file: ./src/frauddetectionservice/Dockerfile | ||
| tag_suffix: frauddetectionservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/frontend/Dockerfile | ||
| tag_suffix: frontend | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/frontendproxy/Dockerfile | ||
| tag_suffix: frontendproxy | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/frontend/Dockerfile.cypress | ||
| tag_suffix: frontend-tests | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/imageprovider/Dockerfile | ||
| tag_suffix: imageprovider | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/kafka/Dockerfile | ||
| tag_suffix: kafka | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/loadgenerator/Dockerfile | ||
| tag_suffix: loadgenerator | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/paymentservice/Dockerfile | ||
| tag_suffix: paymentservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/productcatalogservice/Dockerfile | ||
| tag_suffix: productcatalogservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/quoteservice/Dockerfile | ||
| tag_suffix: quoteservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/recommendationservice/Dockerfile | ||
| tag_suffix: recommendationservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./src/shippingservice/Dockerfile | ||
| tag_suffix: shippingservice | ||
| context: ./ | ||
| setup-qemu: true | ||
| - file: ./test/tracetesting/Dockerfile | ||
| tag_suffix: traceBasedTests | ||
| context: ./ | ||
| setup-qemu: true | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Check for changes and set push options | ||
| id: check_changes | ||
| run: | | ||
| DOCKERFILE_DIR=$(dirname ${{ matrix.file_tag.file }}) | ||
| FILES_CHANGED=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} -- $DOCKERFILE_DIR) | ||
| FORCE_PUSH=${{ inputs.push }} | ||
| if [ "$FORCE_PUSH" = true ]; then | ||
| echo "Force push is enabled, proceeding with build." | ||
| echo "skip=false" >> "$GITHUB_OUTPUT" | ||
| elif [ -z "$FILES_CHANGED" ]; then | ||
| echo "No changes in ${{ matrix.file_tag.context }}, skipping build." | ||
| echo "skip=true" >> "$GITHUB_OUTPUT" | ||
| else | ||
| echo "Changes detected in ${{ matrix.file_tag.context }}, proceeding with build." | ||
| echo "skip=false" >> "$GITHUB_OUTPUT" | ||
| fi | ||
| - name: Log in to the Container registry | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| registry: ghcr.io | ||
| username: ${{ github.repository_owner }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
| if: ${{ inputs.push }} | ||
| - name: Log in to Docker Hub | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| username: ${{ secrets.DOCKER_USERNAME }} | ||
| password: ${{ secrets.DOCKER_PASSWORD }} | ||
| if: ${{ inputs.push }} | ||
| - name: Set up QEMU | ||
| if: ${{ matrix.file_tag.setup-qemu }} | ||
| uses: docker/setup-qemu-action@v3 | ||
| with: | ||
| image: tonistiigi/binfmt:master | ||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
| with: | ||
| config-inline: | | ||
| [worker.oci] | ||
| max-parallelism = 2 | ||
| - name: Matrix Build and push demo images | ||
| if: steps.check_changes.outputs.skip == 'false' | ||
| uses: docker/[email protected] | ||
| with: | ||
| context: ${{ matrix.file_tag.context }} | ||
| file: ${{ matrix.file_tag.file }} | ||
| platforms: linux/amd64,linux/arm64 | ||
| push: ${{ inputs.push }} | ||
| tags: | | ||
| ${{ env.DOCKERHUB_REPO }}:${{ inputs.version }}-${{matrix.file_tag.tag_suffix }} | ||
| ${{ env.DOCKERHUB_REPO }}:latest-${{matrix.file_tag.tag_suffix }} | ||
| ${{ env.GHCR_REPO }}:${{ inputs.version }}-${{ matrix.file_tag.tag_suffix }} | ||
| ${{ env.GHCR_REPO }}:latest-${{ matrix.file_tag.tag_suffix }} | ||
| cache-from: type=gha | ||
| cache-to: type=gha | ||
| uses: ./.github/workflows/component_build_images.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.