linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proxy: Fix docker build (#1122) 

fb8d054e removed the `convert` crate, but did not remove references to
it from the proxy's Dockerfile.
This commit is contained in:
Oliver Gould 2018-06-14 10:46:34 -07:00 committed by GitHub
parent fb8d054e96
commit b6d1db898b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/Dockerfile
View File

@ -16,19 +16,17 @@ WORKDIR /usr/src/conduit
# #
# Mock out all local code and fetch external dependencies to ensure that external sources # Mock out all local code and fetch external dependencies to ensure that external sources
# are cached. # are cached.
RUN for d in proxy proxy/controller-grpc proxy/convert proxy/futures-mpsc-lossy proxy/router ; \ RUN for d in proxy proxy/controller-grpc proxy/futures-mpsc-lossy proxy/router ; \
do mkdir -p "${d}/src" && touch "${d}/src/lib.rs" ; \ do mkdir -p "${d}/src" && touch "${d}/src/lib.rs" ; \
done done
COPY Cargo.toml Cargo.lock ./ COPY Cargo.toml Cargo.lock ./
COPY proxy/Cargo.toml proxy/Cargo.toml COPY proxy/Cargo.toml proxy/Cargo.toml
COPY proxy/controller-grpc/Cargo.toml proxy/controller-grpc/Cargo.toml COPY proxy/controller-grpc/Cargo.toml proxy/controller-grpc/Cargo.toml
COPY proxy/convert/Cargo.toml proxy/convert/Cargo.toml
COPY proxy/futures-mpsc-lossy/Cargo.toml proxy/futures-mpsc-lossy/Cargo.toml COPY proxy/futures-mpsc-lossy/Cargo.toml proxy/futures-mpsc-lossy/Cargo.toml
COPY proxy/router/Cargo.toml proxy/router/Cargo.toml COPY proxy/router/Cargo.toml proxy/router/Cargo.toml
RUN cargo fetch --locked RUN cargo fetch --locked
# Build libraries, leaving the proxy and gRPC bindings mocked out. # Build libraries, leaving the proxy and gRPC bindings mocked out.
COPY proxy/convert proxy/convert
COPY proxy/futures-mpsc-lossy proxy/futures-mpsc-lossy COPY proxy/futures-mpsc-lossy proxy/futures-mpsc-lossy
COPY proxy/router proxy/router COPY proxy/router proxy/router
ARG PROXY_UNOPTIMIZED ARG PROXY_UNOPTIMIZED