Skip to content

Commit

Permalink
Update minimum required rust version and dockerfile (#2858)
Browse files Browse the repository at this point in the history
  • Loading branch information
quentinlesceller authored May 28, 2019
1 parent a745df3 commit ee9b9fe
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ What's working so far?

## Requirements

* rust 1.31+ (use [rustup]((https://www.rustup.rs/))- i.e. `curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env`)
* rust 1.34+ (use [rustup]((https://www.rustup.rs/))- i.e. `curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env`)
* if rust is already installed, you can simply update version with `rustup update`
* clang
* ncurses and libs (ncurses, ncursesw5)
Expand Down
2 changes: 1 addition & 1 deletion doc/build_ES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ El lenguaje de programación de Grin `rust` ha compilado metas para la mayoría

## Requisitos

* rust 1.31+ (usa [rustup]((https://www.rustup.rs/))- por ejemplo, `curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env`)
* rust 1.34+ (usa [rustup]((https://www.rustup.rs/))- por ejemplo, `curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env`)
* Si rust está instalado, puede simplemente actualizar la versión con `rustup update`
* clang
* ncurses y libs (ncurses, ncursesw5)
Expand Down
2 changes: 1 addition & 1 deletion doc/build_JP.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ grinのプログラミング言語である`rust`はほぼ全ての環境に対

## 要件

* rust 1.31+ ([rustup]((https://www.rustup.rs/))を使えば`curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env`でインストール可)
* rust 1.34+ ([rustup]((https://www.rustup.rs/))を使えば`curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env`でインストール可)
* rustをインストール済みの場合は`rustup update`を実行
* clang
* ncursesとそのライブラリ (ncurses, ncursesw5)
Expand Down
2 changes: 1 addition & 1 deletion doc/build_KR.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Grin 프로그래밍 언어는 `rust`로 대부분의 플랫폼들에서 빌드

## 요구사항

* rust 1.31 버전 이상 (다음 명령어를 사용하세요. [rustup]((https://www.rustup.rs/))- 예.) `curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env`)
* rust 1.34 버전 이상 (다음 명령어를 사용하세요. [rustup]((https://www.rustup.rs/))- 예.) `curl https://sh.rustup.rs -sSf | sh; source $HOME/.cargo/env`)

* 만약 rust 가 설치되어 있다면, 다음 명령어를 사용해서 업데이트 할 수 있습니다.
`rustup update`
Expand Down
2 changes: 1 addition & 1 deletion etc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Multistage docker build, requires docker 17.05

# builder stage
FROM rust:1.31 as builder
FROM rust:1.35 as builder

RUN set -ex && \
apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion etc/Dockerfile.floonet
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Multistage docker build, requires docker 17.05

# builder stage
FROM rust:1.31 as builder
FROM rust:1.35 as builder

RUN set -ex && \
apt-get update && \
Expand Down

0 comments on commit ee9b9fe

Please sign in to comment.