Merge branch 'master' into bug/fixes-racecondition-testadvertiser
This commit is contained in:
commit
845f9f9e07
|
@ -5,6 +5,7 @@ ARG RUST_VERSION=${RUST_VERSION:-1.79.0}
|
||||||
ARG BUILD_HOME=/src
|
ARG BUILD_HOME=/src
|
||||||
ARG MAKE_PARALLEL=${MAKE_PARALLEL:-4}
|
ARG MAKE_PARALLEL=${MAKE_PARALLEL:-4}
|
||||||
ARG NIMFLAGS="${NIMFLAGS:-"-d:disableMarchNative"}"
|
ARG NIMFLAGS="${NIMFLAGS:-"-d:disableMarchNative"}"
|
||||||
|
ARG USE_LIBBACKTRACE=${USE_LIBBACKTRACE:-1}
|
||||||
ARG APP_HOME=/codex
|
ARG APP_HOME=/codex
|
||||||
ARG NAT_IP_AUTO=${NAT_IP_AUTO:-false}
|
ARG NAT_IP_AUTO=${NAT_IP_AUTO:-false}
|
||||||
|
|
||||||
|
@ -14,6 +15,7 @@ ARG RUST_VERSION
|
||||||
ARG BUILD_HOME
|
ARG BUILD_HOME
|
||||||
ARG MAKE_PARALLEL
|
ARG MAKE_PARALLEL
|
||||||
ARG NIMFLAGS
|
ARG NIMFLAGS
|
||||||
|
ARG USE_LIBBACKTRACE
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y git cmake curl make bash lcov build-essential
|
RUN apt-get update && apt-get install -y git cmake curl make bash lcov build-essential
|
||||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs/ | sh -s -- --default-toolchain=${RUST_VERSION} -y
|
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs/ | sh -s -- --default-toolchain=${RUST_VERSION} -y
|
||||||
|
|
Loading…
Reference in New Issue