Install diesel to base builder instance

johnshaughnessy · Nov 1, 2023 · 9dbe228 · 9dbe228
1 parent 35f4795
commit 9dbe228
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build-server-image.yml b/.github/workflows/build-server-image.yml
@@ -22,21 +22,21 @@ jobs:
               - 'server/Cargo.lock'
 
       - id: "auth"
-        if: steps.changes.outputs.lock == 'true'
+        # if: steps.changes.outputs.lock == 'true'
         uses: "google-github-actions/auth@v1"
         with:
           credentials_json: "${{ secrets.GCP_SA_KEY }}"
 
       - name: "Set up Cloud SDK"
-        if: steps.changes.outputs.lock == 'true'
+        # if: steps.changes.outputs.lock == 'true'
         uses: "google-github-actions/setup-gcloud@v1"
 
       - name: Configure Docker to use Google Artifact Registry
-        if: steps.changes.outputs.lock == 'true'
+        # if: steps.changes.outputs.lock == 'true'
         run: gcloud auth configure-docker us-central1-docker.pkg.dev
 
       - name: Build Base Builder Image
-        if: steps.changes.outputs.lock == 'true'
+        # if: steps.changes.outputs.lock == 'true'
         run: |
           cd server
           docker build -f Dockerfile.base-builder --target base-builder -t us-central1-docker.pkg.dev/hubs-dev-333333/ocho-osai/johnshaughnessy/track/track-base-builder .

diff --git a/server/Dockerfile.base-builder b/server/Dockerfile.base-builder
@@ -2,6 +2,7 @@
 FROM rust:1.73-slim-buster as base-builder
 WORKDIR /usr/src/app
 RUN apt-get update && apt-get install -y build-essential libpq-dev
+cargo install diesel_cli --no-default-features --features postgres
 COPY . .
 # RUN cargo fetch  # This fetches all dependencies as per Cargo.lock
 RUN cargo build --release # This forces compilation of dependencies