[BLD] [REVERT]: unify Rust Dockerfiles for faster builds

.github/actions/docker/action.yaml

@@ -3,10 +3,10 @@ description: "This action sets up Docker Buildx and authenticates to registries"
 inputs:
   ghcr-username:
     description: "Github Container Registry username"
-    required: false
+    required: true
   ghcr-password:
     description: "Github Container Registry password"
-    required: false
+    required: true
   dockerhub-username:
     description: "DockerHub username"
     required: true
@@ -26,7 +26,6 @@ runs:
       uses: docker/setup-buildx-action@v2
     - name: Log in to the Github Container registry
       uses: docker/[email protected]
-      if: ${{ inputs.ghcr-username != '' }}
       with:
         registry: ghcr.io
         username: ${{ inputs.ghcr-username }}
@@ -36,6 +35,3 @@ runs:
       with:
         username: ${{ inputs.dockerhub-username }}
         password: ${{ inputs.dockerhub-password }}
-    - uses: useblacksmith/[email protected]
-      with:
-        setup-only: true

.github/workflows/_build_release_container.yml

@@ -66,8 +66,7 @@ jobs:
         uses: useblacksmith/[email protected]
         with:
           context: .
-          file: rust/Dockerfile
-          target: cli
+          file: rust/cli/Dockerfile
           platforms: ${{ env.PLATFORMS }}
           push: true
           build-args: |

.github/workflows/_go-tests.yml

@@ -15,11 +15,9 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup
         uses: ./.github/actions/go
-      - name: Set up Docker
-        uses: ./.github/actions/docker
+      - uses: useblacksmith/[email protected]
         with:
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN }}
+          setup-only: true
       - uses: ./.github/actions/tilt
       - run: bin/cluster-test.sh bash -c 'cd go && make test'
       - name: Save service logs to artifact

.github/workflows/_python-tests.yml

@@ -179,11 +179,9 @@ jobs:
       #     languages: python
       #     api_key: ${{ secrets.DD_API_KEY }}
       #     site: ${{ vars.DD_SITE }}
-      - name: Set up Docker
-        uses: ./.github/actions/docker
+      - uses: useblacksmith/[email protected]
         with:
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN }}
+          setup-only: true
       - uses: ./.github/actions/tilt
       - name: Test
         run: bin/cluster-test.sh bash -c 'python -m pytest "${{ matrix.test-globs }}"' --durations 10

.github/workflows/_rust-tests.yml

@@ -76,11 +76,9 @@ jobs:
         uses: ./.github/actions/rust
         with:
           github-token: ${{ github.token }}
-      - name: Set up Docker
-        uses: ./.github/actions/docker
+      - uses: useblacksmith/[email protected]
         with:
-          dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          dockerhub-password: ${{ secrets.DOCKERHUB_TOKEN }}
+          setup-only: true
       - name: Start services in Tilt
         uses: ./.github/actions/tilt
       - name: Build CLI

.github/workflows/pr.yml

@@ -191,7 +191,6 @@ jobs:
     needs: change-detection
     if: contains(fromJson(needs.change-detection.outputs.tests-to-run), 'go')
     uses: ./.github/workflows/_go-tests.yml
-    secrets: inherit
 
   check-title:
     name: Check PR Title

Tiltfile

@@ -40,16 +40,15 @@ else:
 if config.tilt_subcommand == "ci":
   custom_build(
     'rust-log-service',
-    'docker buildx build --load -t $EXPECTED_REF --target=log_service -f ./rust/Dockerfile .',
+    'docker buildx build --load -t $EXPECTED_REF -f ./rust/log-service/Dockerfile .',
     ['./rust/', './idl/', './Cargo.toml', './Cargo.lock']
   )
 else:
   docker_build(
     'rust-log-service',
     '.',
     only=["rust/", "idl/", "Cargo.toml", "Cargo.lock"],
-    dockerfile='./rust/Dockerfile',
-    target='log_service'
+    dockerfile='./rust/log-service/Dockerfile',
   )
 
 if config.tilt_subcommand == "ci":
@@ -85,60 +84,59 @@ else:
 if config.tilt_subcommand == "ci":
   custom_build(
     'rust-frontend-service',
-    'docker buildx build --load -t $EXPECTED_REF -f ./rust/Dockerfile --target cli . ',
+    'docker buildx build --load -t $EXPECTED_REF -f ./rust/cli/Dockerfile . ',
     ['./rust/', './idl/', './Cargo.toml', './Cargo.lock']
   )
 else:
   docker_build(
     'rust-frontend-service',
     '.',
     only=["rust/", "idl/", "Cargo.toml", "Cargo.lock"],
-    dockerfile='./rust/Dockerfile',
-    target='cli'
+    dockerfile='./rust/cli/Dockerfile',
   )
 
 if config.tilt_subcommand == "ci":
   custom_build(
     'query-service',
-    'docker buildx build --load -t $EXPECTED_REF --target query_service -f ./rust/Dockerfile .',
+    'docker buildx build --load -t $EXPECTED_REF --target query_service -f ./rust/worker/Dockerfile .',
     ['./rust/', './idl/', './Cargo.toml', './Cargo.lock']
   )
 else:
   docker_build(
     'query-service',
     '.',
     only=["rust/", "idl/", "Cargo.toml", "Cargo.lock"],
-    dockerfile='./rust/Dockerfile',
+    dockerfile='./rust/worker/Dockerfile',
     target='query_service'
   )
 
 if config.tilt_subcommand == "ci":
   custom_build(
     'compaction-service',
-    'docker buildx build --load -t $EXPECTED_REF --target compaction_service -f ./rust/Dockerfile .',
+    'docker buildx build --load -t $EXPECTED_REF --target compaction_service -f ./rust/worker/Dockerfile .',
     ['./rust/', './idl/', './Cargo.toml', './Cargo.lock']
   )
 else:
   docker_build(
     'compaction-service',
     '.',
     only=["rust/", "idl/", "Cargo.toml", "Cargo.lock"],
-    dockerfile='./rust/Dockerfile',
+    dockerfile='./rust/worker/Dockerfile',
     target='compaction_service'
   )
 
 if config.tilt_subcommand == "ci":
   custom_build(
     'garbage-collector',
-    'docker buildx build --load -t $EXPECTED_REF --target garbage_collector -f ./rust/Dockerfile .',
+    'docker buildx build --load -t $EXPECTED_REF --target garbage_collector -f ./rust/garbage_collector/Dockerfile .',
     ['./rust/', './idl/', './Cargo.toml', './Cargo.lock']
   )
 else:
   docker_build(
     'garbage-collector',
     '.',
     only=["rust/", "idl/", "Cargo.toml", "Cargo.lock"],
-    dockerfile='./rust/Dockerfile',
+    dockerfile='./rust/garbage_collector/Dockerfile',
     target='garbage_collector'
   )
 

docker-compose.yml

@@ -9,8 +9,7 @@ services:
     image: server
     build:
       context: .
-      dockerfile: rust/Dockerfile
-      target: cli
+      dockerfile: rust/cli/Dockerfile
       # Uncomment below to build in release mode
       # args:
       #   RELEASE_MODE: "1"

rust-toolchain.toml

@@ -1,4 +1,8 @@
 [toolchain]
-# Keep this version in sync with rust/Dockerfile.
+# Keep this version in sync with:
+# - rust/cli/Dockerfile
+# - rust/load/Dockerfile
+# - rust/log/Dockerfile
+# - rust/worker/Dockerfile
 channel = "1.81.0"
 components = ["rustfmt", "clippy"]