Skip to content

updating rust compiler (WIP) #342

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

Open
mattraffel wants to merge 7 commits into
base: master
Choose a base branch
from
Open

updating rust compiler (WIP) #342

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4990b6f
Merge pull request #1 from sovrin-foundation/master
mattraffel Dec 18, 2018
5ad74bf
upgrading rust compiler version
Jan 16, 2019
93099b6
fixes libsodium dl url
Jan 17, 2019
88fd8e4
updated ci build version
Jan 17, 2019
03036b4
updating versions of dockerfile deps
Jan 17, 2019
32686e2
updating for libsodium
Jan 18, 2019
26b092a
fixes misspelling
Feb 14, 2019
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
6 changes: 3 additions & 3 deletions devops/docker/base/xenial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM evernym/dockerbase:rust-xenial-0.8.0
FROM evernym/dockerbase:rust-xenial-0.9.0
# TODO LABEL maintainer="Name <email-address>"

ARG u_id=1000
Expand All @@ -13,7 +13,7 @@ ENV LIBSODIUM_INC_DIR=/usr/include
# install libsodium from the sources
ENV LIBSODIUM_VERSION=1.0.14
RUN cd /tmp \
&& curl https://download.libsodium.org/libsodium/releases/libsodium-${LIBSODIUM_VERSION}.tar.gz | tar -xz \
&& curl https://download.libsodium.org/libsodium/releases/old/libsodium-${LIBSODIUM_VERSION}.tar.gz | tar -xz \
&& cd /tmp/libsodium-${LIBSODIUM_VERSION} \
&& ./configure --prefix=/usr/local/ && make && make install \
&& ldconfig \
Expand Down Expand Up @@ -47,4 +47,4 @@ RUN cd /tmp/libsovtoken \
# TODO CMD ENTRYPOINT ...


ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.12.0
ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.14.0
4 changes: 2 additions & 2 deletions devops/docker/ci/xenial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM evernym/libsovtoken:base-xenial-0.12.0
FROM evernym/libsovtoken:base-xenial-0.14.0
# TODO LABEL maintainer="Name <email-address>"

ARG LIBINDY_CRYPTO_VERSION
Expand Down Expand Up @@ -69,4 +69,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh
ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"]

ENV LIBSOVTOKEN_CI_ENV_VERSION=0.49.0
ENV LIBSOVTOKEN_CI_ENV_VERSION=0.50.0
2 changes: 1 addition & 1 deletion devops/ext/docker/rust/xenial/Dockerfile.0.8.0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM evernym/dockerbase:base-xenial-0.5.0

ARG RUST_VERSION

ENV RUST_VERSION=${RUST_VERSION:-1.27.0}
ENV RUST_VERSION=${RUST_VERSION:-1.31.0}
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH
Expand Down
18 changes: 18 additions & 0 deletions devops/ext/docker/rust/xenial/Dockerfile.0.9.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM evernym/dockerbase:base-xenial-0.5.0
# TODO LABEL maintainer="Name <email-address>"

ARG RUST_VERSION

ENV RUST_VERSION=${RUST_VERSION:-1.31.0}
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain $RUST_VERSION \
&& chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
&& rustup --version \
&& cargo --version \
&& rustc --version

# TODO CMD ENTRYPOINT ...

ENV RUST_ENV_VERSION=0.9.0
2 changes: 1 addition & 1 deletion libsovtoken/dev/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN apt-get -qq update -y && apt-get -qq install -y sudo zip unzip cmake autocon
&& useradd -m -d /home/token_user -s /bin/bash -p $(openssl passwd -1 "token") token_user \
&& usermod -aG sudo token_user \
&& cd /tmp \
&& curl https://download.libsodium.org/libsodium/releases/libsodium-1.0.14.tar.gz | tar -xz \
&& curl https://download.libsodium.org/libsodium/releases/old/libsodium-1.0.14.tar.gz | tar -xz \
&& cd libsodium-1.0.14 \
&& ./autogen.sh \
&& ./configure \
Expand Down