collab: Override Cargo configuration in the Dockerfile
(#17901)
This PR moves the override for the Cargo configuration for collab into the `Dockerfile` rather than having it be something some in the external environment. This makes it possible to build the Docker image locally without having to replace `.cargo/config.toml` with the contents of `.cargo/collab-config.toml`. Release Notes: - N/A
This commit is contained in:
parent
b48c2c5846
commit
dea85099a2
2 changed files with 3 additions and 3 deletions
3
.github/workflows/deploy_collab.yml
vendored
3
.github/workflows/deploy_collab.yml
vendored
|
@ -75,9 +75,6 @@ jobs:
|
||||||
with:
|
with:
|
||||||
clean: false
|
clean: false
|
||||||
|
|
||||||
- name: Set up default .cargo/config.toml
|
|
||||||
run: cp ./.cargo/collab-config.toml ./.cargo/config.toml
|
|
||||||
|
|
||||||
- name: Build docker image
|
- name: Build docker image
|
||||||
run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA
|
run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,9 @@ FROM rust:1.81-bookworm as builder
|
||||||
WORKDIR app
|
WORKDIR app
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
|
# Replace the Cargo configuration with the one used by collab.
|
||||||
|
COPY ./.cargo/collab-config.toml ./.cargo/config.toml
|
||||||
|
|
||||||
# Compile collab server
|
# Compile collab server
|
||||||
ARG CARGO_PROFILE_RELEASE_PANIC=abort
|
ARG CARGO_PROFILE_RELEASE_PANIC=abort
|
||||||
ARG GITHUB_SHA
|
ARG GITHUB_SHA
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue