Skip to content

Commit

Permalink
Disable default toolchain and update dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
AurevoirXavier committed Jul 28, 2023
1 parent be37174 commit ce9a586
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ inputs:
build_dockerfile:
description: "build dockerfile path"
required: true
default: ".maintain/docker/build.Dockerfile"
default: ".maintain/docker/ubuntu:20.04.Dockerfile"
enable_cache:
description: "enable cache"
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
uses: docker/build-push-action@v4
with:
context: .
file: .maintain/docker/build.Dockerfile
file: .maintain/docker/ubuntu:20.04.Dockerfile
tags: darwinia-network/build-tool:latest

- name: Build testnets
Expand Down
5 changes: 0 additions & 5 deletions .maintain/docker/ubuntu:20.04

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
FROM ubuntu:20.04

ARG RUST_TOOLCHAIN=nightly


RUN apt-get update \
&& apt install --no-install-recommends -y \
ca-certificates curl git python3-pip \
clang make gcc g++ libssl-dev pkg-config protobuf-compiler \
ca-certificates curl git python3-pip \
clang make gcc g++ libssl-dev pkg-config protobuf-compiler \
&& pip3 install --upgrade pip \
&& pip3 install cmake --upgrade \
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
&& . "/root/.cargo/env" \
&& rustup default $RUST_TOOLCHAIN
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain none \
&& . "/root/.cargo/env"

ENV PATH="$PATH:/root/.cargo/bin"

WORKDIR /build


0 comments on commit ce9a586

Please sign in to comment.