Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert the rust, proto change in dockerfiles #1937

Merged
merged 3 commits into from
Apr 25, 2023
Merged

Revert the rust, proto change in dockerfiles #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5c6949
fix build and make.sh script
sieniven Apr 25, 2023
a4bf845
Merge branch 'feature/evm' into niven/build-fix
prasannavl Apr 25, 2023
f84cd9c
Update make.sh
prasannavl Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions contrib/dockerfiles/aarch64-apple-darwin.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ COPY ./make.sh .

RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_update_base
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_rust
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps_osx_tools
ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup target add aarch64-apple-darwin

COPY . .
RUN ./make.sh clean-depends && ./make.sh build-deps
Expand Down
3 changes: 0 additions & 3 deletions contrib/dockerfiles/aarch64-linux-gnu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ COPY ./make.sh .

RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_update_base
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_rust
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps_arm64
ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup target add aarch64-unknown-linux-gnu

COPY . .
RUN ./make.sh clean-depends && ./make.sh build-deps
Expand Down
3 changes: 0 additions & 3 deletions contrib/dockerfiles/arm-linux-gnueabihf.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ COPY ./make.sh .

RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_update_base
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_rust
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps_armhf
ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup target add armv7-unknown-linux-gnueabihf

COPY . .
RUN ./make.sh clean-depends && ./make.sh build-deps
Expand Down
3 changes: 0 additions & 3 deletions contrib/dockerfiles/x86_64-apple-darwin.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ COPY ./make.sh .

RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_update_base
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_rust
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps_osx_tools
ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup target add x86_64-apple-darwin

COPY . .
RUN ./make.sh clean-depends && ./make.sh build-deps
Expand Down
3 changes: 0 additions & 3 deletions contrib/dockerfiles/x86_64-pc-linux-gnu-clang.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ COPY ./make.sh .

RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_update_base
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_rust
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_llvm
ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup target add x86_64-unknown-linux-gnu

COPY . .
RUN ./make.sh clean-depends && \
Expand Down
3 changes: 0 additions & 3 deletions contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ COPY ./make.sh .

RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_update_base
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_rust
ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup target add x86_64-unknown-linux-gnu

COPY . .
RUN ./make.sh clean-depends && ./make.sh build-deps
Expand Down
3 changes: 0 additions & 3 deletions contrib/dockerfiles/x86_64-w64-mingw32.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ COPY ./make.sh .

RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_update_base
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_rust
RUN export DEBIAN_FRONTEND=noninteractive && ./make.sh pkg_install_deps_mingw_x86_64
ENV PATH="/root/.cargo/bin:${PATH}"
RUN rustup target add x86_64-pc-windows-gnu

RUN update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
RUN update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
Expand Down
2 changes: 1 addition & 1 deletion make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ pkg_install_deps() {
libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev \
libminiupnpc-dev libzmq3-dev libqrencode-dev wget \
libdb-dev libdb++-dev libdb5.3 libdb5.3-dev libdb5.3++ libdb5.3++-dev \
curl cmake unzip protobuf-compiler
curl cmake unzip

_fold_end
}
Expand Down