parent
0b0d72774a
commit
2fc01d975e
|
|
@ -1,4 +1,4 @@
|
||||||
ARG BASE_IMAGE=rust:1.44.0-buster
|
ARG BASE_IMAGE=rust:1.44.1-buster
|
||||||
FROM $BASE_IMAGE
|
FROM $BASE_IMAGE
|
||||||
WORKDIR /linkerd
|
WORKDIR /linkerd
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
# Intended to be run on a remote DOCKER_HOST
|
# Intended to be run on a remote DOCKER_HOST
|
||||||
ARG RUST_IMAGE=rust:1.44.0-buster
|
ARG RUST_IMAGE=rust:1.44.1-buster
|
||||||
FROM $RUST_IMAGE as build
|
FROM $RUST_IMAGE as build
|
||||||
WORKDIR /usr/src/linkerd2-proxy
|
WORKDIR /usr/src/linkerd2-proxy
|
||||||
COPY . ./
|
COPY . ./
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ jobs:
|
||||||
fmt:
|
fmt:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-18.04
|
||||||
container:
|
container:
|
||||||
image: docker://rust:1.44.0-buster
|
image: docker://rust:1.44.1-buster
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- run: rustup component add rustfmt
|
- run: rustup component add rustfmt
|
||||||
|
|
@ -19,7 +19,7 @@ jobs:
|
||||||
lib:
|
lib:
|
||||||
runs-on: ubuntu-18.04
|
runs-on: ubuntu-18.04
|
||||||
container:
|
container:
|
||||||
image: docker://rust:1.44.0-buster
|
image: docker://rust:1.44.1-buster
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
- run: make test-lib
|
- run: make test-lib
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
# :; docker buildx build . --load
|
# :; docker buildx build . --load
|
||||||
|
|
||||||
# Please make changes via update-rust-version.sh
|
# Please make changes via update-rust-version.sh
|
||||||
ARG RUST_IMAGE=rust:1.44.0-buster
|
ARG RUST_IMAGE=rust:1.44.1-buster
|
||||||
|
|
||||||
# Use an arbitrary ~recent edge release image to get the proxy
|
# Use an arbitrary ~recent edge release image to get the proxy
|
||||||
# identity-initializing wrapper.
|
# identity-initializing wrapper.
|
||||||
|
|
@ -38,7 +38,7 @@ ARG PROXY_FEATURES
|
||||||
WORKDIR /usr/src/linkerd2-proxy
|
WORKDIR /usr/src/linkerd2-proxy
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN --mount=type=cache,target=target \
|
RUN --mount=type=cache,target=target \
|
||||||
--mount=type=cache,from=rust:1.44.0-buster,source=/usr/local/cargo,target=/usr/local/cargo \
|
--mount=type=cache,from=rust:1.44.1-buster,source=/usr/local/cargo,target=/usr/local/cargo \
|
||||||
mkdir -p /out && \
|
mkdir -p /out && \
|
||||||
if [ -n "$PROXY_UNOPTIMIZED" ]; then \
|
if [ -n "$PROXY_UNOPTIMIZED" ]; then \
|
||||||
(cd linkerd2-proxy && cargo build --locked --features="$PROXY_FEATURES") && \
|
(cd linkerd2-proxy && cargo build --locked --features="$PROXY_FEATURES") && \
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
ARG RUST_IMAGE=rust:1.44.0-buster
|
ARG RUST_IMAGE=rust:1.44.1-buster
|
||||||
ARG RUNTIME_IMAGE=debian:bullseye-slim
|
ARG RUNTIME_IMAGE=debian:bullseye-slim
|
||||||
ARG RUSTFLAGS="-C debuginfo=2 -C lto=off"
|
ARG RUSTFLAGS="-C debuginfo=2 -C lto=off"
|
||||||
## Builds the proxy as incrementally as possible.
|
## Builds the proxy as incrementally as possible.
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
1.44.0
|
1.44.1
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue