Skip to content

Commit

Permalink
install newer version of rust (#49)
Browse files Browse the repository at this point in the history
* install newer version of rust

ex_secp256k1 fails to compile on Rust 1.39.0 because of
https://github.com/dalek-cryptography/subtle which works only on Rust
1.41 or higher.

* do not install `libsecp256k1` packages

* remove run_deps

* install as part of utils

* change the order of commands

* bump alpine version for erlang

* bump all alpines to 3.12

* fix python in deploy container
  • Loading branch information
ayrat555 authored Sep 15, 2020
1 parent 694089d commit e8cf348
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12

LABEL maintainer="OmiseGO Team <[email protected]>"
LABEL description="Builder image for OmiseGO elixir-omg"
Expand Down
2 changes: 1 addition & 1 deletion builder/Dockerfile.erlang
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12

ARG OTP_VERSION="22.3"
ARG OTP_DOWNLOAD_SHA256="886e6dbe1e4823c7e8d9c9c1ba8315075a1a9f7717f5a1eaf3b98345ca6c798e"
Expand Down
5 changes: 2 additions & 3 deletions builder_childchain/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12

LABEL maintainer="OmiseGO Team <[email protected]>"
LABEL description="Thin Builder image for OmiseGO Childchain"
Expand All @@ -22,8 +22,6 @@ ENV PATH=/usr/local/otp/bin:$PATH
ENV PATH=/usr/local/rebar3/bin:$PATH
ENV PATH=/usr/local/elixir/bin:$PATH

RUN apk add --no-cache rust=1.39.0-r0 cargo=1.39.0-r0

ENV HOME /home/${USER}
ENV LANG=en_US.UTF-8
ENV LC_ALL=en_US.UTF-8
Expand Down Expand Up @@ -62,6 +60,7 @@ RUN set -xe \
ca-certificates \
libressl-dev \
lksctp-tools \
&& apk add --no-cache rust=1.44.0-r0 cargo=1.44.0-r0 \
&& addgroup -g ${GID} ${GROUP} \
&& adduser -D -h ${HOME} -u ${UID} -G ${GROUP} -H ${USER} \
&& mkdir -p "${HOME}" \
Expand Down
4 changes: 2 additions & 2 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12

LABEL maintainer="OmiseGO Team <[email protected]>"
LABEL description="Deploy image for OmiseGO elixir-omg"
Expand All @@ -19,7 +19,7 @@ ARG CLOUD_SDK_DOWNLOAD_SHA256="10e08362e750581c6ff3866314ed439a1bb544755657b204b

RUN set -xe \
&& apk add --update --no-cache --virtual .gcloud-runtime \
python \
python2 \
py-crcmod \
libc6-compat \
&& CLOUD_SDK_DOWNLOAD_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz" \
Expand Down
2 changes: 1 addition & 1 deletion tester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12

LABEL maintainer="OmiseGO Team <[email protected]>"
LABEL description="Builder image for OmiseGO elixir-omg"
Expand Down
2 changes: 1 addition & 1 deletion tester/Dockerfile.geth
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.11
FROM alpine:3.12

ARG GO_VERSION="1.13.8"
#https://golang.org/dl/
Expand Down

0 comments on commit e8cf348

Please sign in to comment.