Test with no tags and if

DataDog · Sep 20, 2024 · fc424db · fc424db
1 parent e2e713c
commit fc424db
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -30,17 +30,17 @@ jobs:
  # Tag image separately to avoid interference with caching and so that testing step can reference the image
  - name: Build single-arch image (x86-64)
  run: |
- docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog:${{ github.run_id }} --output=type=image,push=false --platform linux/x86_64 -f ./Dockerfile
+ docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog --output=type=image,push=false --platform linux/x86_64 -f ./Dockerfile
  - name: Tag single-arch image (x86-64)
  run: |
- docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog:${{ github.run_id }} --load --platform linux/x86_64 -f ./Dockerfile --tag ghcr.io/datadog/catadog:${{ github.run_id }}
+ docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog --load --platform linux/x86_64 -f ./Dockerfile --tag ghcr.io/datadog/catadog
  - name: Test single-arch image (x86-64)
  run: |
- docker run --platform linux/x86_64 --rm ghcr.io/datadog/catadog:${{ github.run_id }} /bin/sh -c 'true'
- docker run --platform linux/x86_64 --rm ghcr.io/datadog/catadog:${{ github.run_id }} ruby -e 'puts RUBY_DESCRIPTION'
- docker run --platform linux/x86_64 --rm ghcr.io/datadog/catadog:${{ github.run_id }} gem --version
- docker run --platform linux/x86_64 --rm ghcr.io/datadog/catadog:${{ github.run_id }} bundle --version
- docker run --platform linux/x86_64 --rm -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/catadog:${{ github.run_id }} /bin/sh -c 'bundle install && bundle exec rake test'
+ docker run --platform linux/x86_64 --rm ghcr.io/datadog/catadog /bin/sh -c 'true'
+ docker run --platform linux/x86_64 --rm ghcr.io/datadog/catadog ruby -e 'puts RUBY_DESCRIPTION'
+ docker run --platform linux/x86_64 --rm ghcr.io/datadog/catadog gem --version
+ docker run --platform linux/x86_64 --rm ghcr.io/datadog/catadog bundle --version
+ docker run --platform linux/x86_64 --rm -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/catadog /bin/sh -c 'bundle install && bundle exec rake test'
 
  # Build image for aarch64-linux, emulated under qemu
  # 
@@ -50,26 +50,25 @@ jobs:
  docker run --privileged --rm tonistiigi/binfmt --install arm64
  - name: Build single-arch image (aarch64-linux)
  run: |
- docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog:${{ github.run_id }} --output=type=image,push=false --platform linux/aarch64 -f ./Dockerfile
+ docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog --output=type=image,push=false --platform linux/aarch64 -f ./Dockerfile
  - name: Tag single-arch image (aarch64-linux)
  run: |
- docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog:${{ github.run_id }} --load --platform linux/aarch64 -f ./Dockerfile --tag ghcr.io/datadog/catadog:${{ github.run_id }}
+ docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog --load --platform linux/aarch64 -f ./Dockerfile --tag ghcr.io/datadog/catadog
  - name: Test single-arch image (aarch64-linux)
  run: |
- docker run --platform linux/aarch64 --rm ghcr.io/datadog/catadog:${{ github.run_id }} /bin/sh -c 'true'
- docker run --platform linux/aarch64 --rm ghcr.io/datadog/catadog:${{ github.run_id }} ruby -e 'puts RUBY_DESCRIPTION'
- docker run --platform linux/aarch64 --rm ghcr.io/datadog/catadog:${{ github.run_id }} gem --version
- docker run --platform linux/aarch64 --rm ghcr.io/datadog/catadog:${{ github.run_id }} bundle --version
- docker run --platform linux/aarch64 --rm -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/catadog:${{ github.run_id }} /bin/sh -c 'bundle install && bundle exec rake test'
+ docker run --platform linux/aarch64 --rm ghcr.io/datadog/catadog /bin/sh -c 'true'
+ docker run --platform linux/aarch64 --rm ghcr.io/datadog/catadog ruby -e 'puts RUBY_DESCRIPTION'
+ docker run --platform linux/aarch64 --rm ghcr.io/datadog/catadog gem --version
+ docker run --platform linux/aarch64 --rm ghcr.io/datadog/catadog bundle --version
+ docker run --platform linux/aarch64 --rm -v "${PWD}":"${PWD}" -w "${PWD}" ghcr.io/datadog/catadog /bin/sh -c 'bundle install && bundle exec rake test'
  
  # Assemble multi-arch image for a combined push to the registry
  # 
  # Docker build is rerun, but build is fast because the layers are already cached
  - name: Log in to the container registry
- if: ${{ inputs.push }}
  run: |
  echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
  - name: Build multi-arch image (x86-64, aarch64)
  if: ${{ inputs.push }}
  run: |
- docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog:${{ github.run_id }} --output=type=image,push=true --build-arg BUILDKIT_INLINE_CACHE=1 --platform linux/x86_64,linux/aarch64 -f ./Dockerfile --tag ghcr.io/datadog/catadog:${{ github.run_id }}
+ docker buildx build . --builder=container --cache-from=type=registry,ref=ghcr.io/datadog/catadog --output=type=image,push=true --build-arg BUILDKIT_INLINE_CACHE=1 --platform linux/x86_64,linux/aarch64 -f ./Dockerfile --tag ghcr.io/datadog/catadog