added rust compiler support
sgraves/cpp-build-system_mac/pipeline/head There was a failure building this commit
sgraves/cpp-build-system_mac/pipeline/head There was a failure building this commit
This commit is contained in:
1 parent
bc95d9d5f1
commit
fee41e2262
5 files changed
+85
-1
No files matched your search
@@ -16,6 +16,7 @@ RUN apk add \
|
|||||||
boost-dev \
|
boost-dev \
|
||||||
bzip2-static \
|
bzip2-static \
|
||||||
cmake \
|
cmake \
|
||||||
|
curl \
|
||||||
diffutils \
|
diffutils \
|
||||||
elfutils-dev \
|
elfutils-dev \
|
||||||
file \
|
file \
|
||||||
@@ -83,3 +84,28 @@ RUN apk add \
|
|||||||
|
|
||||||
RUN ln -sf /usr/bin/aclocal-1.18 /usr/bin/aclocal-1.16
|
RUN ln -sf /usr/bin/aclocal-1.18 /usr/bin/aclocal-1.16
|
||||||
RUN ln -sf /usr/bin/automake-1.18 /usr/bin/automake-1.16
|
RUN ln -sf /usr/bin/automake-1.18 /usr/bin/automake-1.16
|
||||||
|
|
||||||
|
ARG RUST_VERSION=stable
|
||||||
|
|
||||||
|
ENV RUSTUP_HOME=/opt/rustup
|
||||||
|
ENV CARGO_HOME=/opt/cargo
|
||||||
|
ENV PATH="/opt/cargo/bin:${PATH}"
|
||||||
|
|
||||||
|
RUN curl --proto '=https' --tlsv1.2 -fsSL \
|
||||||
|
https://sh.rustup.rs -o /tmp/rustup-init.sh \
|
||||||
|
&& sh /tmp/rustup-init.sh \
|
||||||
|
-y \
|
||||||
|
--no-modify-path \
|
||||||
|
--profile minimal \
|
||||||
|
--default-toolchain "${RUST_VERSION}" \
|
||||||
|
&& rm /tmp/rustup-init.sh
|
||||||
|
|
||||||
|
ARG GID
|
||||||
|
ARG UID
|
||||||
|
RUN chown -R "${UID}:${GID}" /opt/rustup
|
||||||
|
RUN chown -R "${UID}:${GID}" /opt/cargo
|
||||||
|
|
||||||
|
RUN rustc --version \
|
||||||
|
&& cargo --version \
|
||||||
|
&& rustup target list --installed
|
||||||
|
|
||||||
File renamed without changes.
@@ -16,6 +16,7 @@ RUN apk add \
|
|||||||
boost-dev \
|
boost-dev \
|
||||||
bzip2-static \
|
bzip2-static \
|
||||||
cmake \
|
cmake \
|
||||||
|
curl \
|
||||||
diffutils \
|
diffutils \
|
||||||
elfutils-dev \
|
elfutils-dev \
|
||||||
file \
|
file \
|
||||||
@@ -83,3 +84,28 @@ RUN apk add \
|
|||||||
|
|
||||||
RUN ln -sf /usr/bin/aclocal-1.18 /usr/bin/aclocal-1.16
|
RUN ln -sf /usr/bin/aclocal-1.18 /usr/bin/aclocal-1.16
|
||||||
RUN ln -sf /usr/bin/automake-1.18 /usr/bin/automake-1.16
|
RUN ln -sf /usr/bin/automake-1.18 /usr/bin/automake-1.16
|
||||||
|
|
||||||
|
ARG RUST_VERSION=stable
|
||||||
|
|
||||||
|
ENV RUSTUP_HOME=/opt/rustup
|
||||||
|
ENV CARGO_HOME=/opt/cargo
|
||||||
|
ENV PATH="/opt/cargo/bin:${PATH}"
|
||||||
|
|
||||||
|
RUN curl --proto '=https' --tlsv1.2 -fsSL \
|
||||||
|
https://sh.rustup.rs -o /tmp/rustup-init.sh \
|
||||||
|
&& sh /tmp/rustup-init.sh \
|
||||||
|
-y \
|
||||||
|
--no-modify-path \
|
||||||
|
--profile minimal \
|
||||||
|
--default-toolchain "${RUST_VERSION}" \
|
||||||
|
&& rm /tmp/rustup-init.sh
|
||||||
|
|
||||||
|
ARG GID
|
||||||
|
ARG UID
|
||||||
|
RUN chown -R "${UID}:${GID}" /opt/rustup
|
||||||
|
RUN chown -R "${UID}:${GID}" /opt/cargo
|
||||||
|
|
||||||
|
RUN rustc --version \
|
||||||
|
&& cargo --version \
|
||||||
|
&& rustup target list --installed
|
||||||
|
|
||||||
@@ -11,6 +11,7 @@ RUN apk add \
|
|||||||
binutils \
|
binutils \
|
||||||
bison \
|
bison \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
|
ca-certificates \
|
||||||
clang21-extra-tools \
|
clang21-extra-tools \
|
||||||
cmake \
|
cmake \
|
||||||
curl \
|
curl \
|
||||||
@@ -1193,6 +1194,37 @@ RUN (cp ${MY_MINGW_DIR}/lib/*.dll ${MY_MINGW_DIR}/bin || echo "no dll's found")
|
|||||||
&& rm -rf /3rd_party \
|
&& rm -rf /3rd_party \
|
||||||
&& rm -rf /root/.wine
|
&& rm -rf /root/.wine
|
||||||
|
|
||||||
|
ARG RUST_VERSION=stable
|
||||||
|
|
||||||
|
ENV RUSTUP_HOME=/opt/rustup
|
||||||
|
ENV CARGO_HOME=/opt/cargo
|
||||||
|
ENV PATH="/opt/cargo/bin:${PATH}"
|
||||||
|
|
||||||
|
RUN curl --proto '=https' --tlsv1.2 -fsSL \
|
||||||
|
https://sh.rustup.rs -o /tmp/rustup-init.sh \
|
||||||
|
&& sh /tmp/rustup-init.sh \
|
||||||
|
-y \
|
||||||
|
--no-modify-path \
|
||||||
|
--profile minimal \
|
||||||
|
--default-host x86_64-unknown-linux-musl \
|
||||||
|
--default-toolchain "${RUST_VERSION}" \
|
||||||
|
--target x86_64-pc-windows-gnu \
|
||||||
|
&& rm /tmp/rustup-init.sh
|
||||||
|
|
||||||
|
ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER="${MY_MINGW_PREFIX}-gcc"
|
||||||
|
ENV CC_x86_64_pc_windows_gnu="${MY_MINGW_PREFIX}-gcc"
|
||||||
|
ENV CXX_x86_64_pc_windows_gnu="${MY_MINGW_PREFIX}-g++"
|
||||||
|
ENV AR_x86_64_pc_windows_gnu="${MY_MINGW_PREFIX}-ar"
|
||||||
|
|
||||||
|
RUN rustc --version \
|
||||||
|
&& cargo --version \
|
||||||
|
&& rustup target list --installed
|
||||||
|
|
||||||
|
ARG GID
|
||||||
|
ARG UID
|
||||||
|
RUN chown -R "${UID}:${GID}" /opt/rustup
|
||||||
|
RUN chown -R "${UID}:${GID}" /opt/cargo
|
||||||
|
|
||||||
USER $USERNAME
|
USER $USERNAME
|
||||||
WORKDIR /home/$USERNAME
|
WORKDIR /home/$USERNAME
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@ if [ -f "${PROJECT_SOURCE_DIR}/web/${PROJECT_NAME}/pubspec.yaml" ]; then
|
|||||||
--build-arg UID=$(id -u) \
|
--build-arg UID=$(id -u) \
|
||||||
--build-arg GID=$(id -g) \
|
--build-arg GID=$(id -g) \
|
||||||
-t ${FLUTTER_TAG_NAME} \
|
-t ${FLUTTER_TAG_NAME} \
|
||||||
-f "${PROJECT_SOURCE_DIR}/docker/x86_64/flutter" || exit 1
|
-f "${PROJECT_SOURCE_DIR}/docker/any/flutter" || exit 1
|
||||||
|
|
||||||
docker run -td \
|
docker run -td \
|
||||||
--name ${FLUTTER_CONTAINER_NAME} \
|
--name ${FLUTTER_CONTAINER_NAME} \
|
||||||
|
|||||||
Reference in new issue
Block a user