1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 14:58:09 +00:00

docker: quick fix of Dockerfiles

This commit is contained in:
Pavol Rusnak 2018-10-10 14:19:59 +02:00
parent 3a4660ede2
commit 7ab36d57ab
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 16 additions and 4 deletions

View File

@ -6,7 +6,8 @@ FROM debian:9
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \
build-essential curl unzip git python3 python3-pip gcc-arm-none-eabi libnewlib-arm-none-eabi build-essential curl unzip git python3 python3-pip \
gcc-arm-none-eabi libnewlib-arm-none-eabi
ENV PROTOBUF_VERSION=3.4.0 ENV PROTOBUF_VERSION=3.4.0
RUN curl -LO "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" RUN curl -LO "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip"
@ -16,6 +17,9 @@ ENV PYTHON=python3
# use zipfile module to extract files world-readable # use zipfile module to extract files world-readable
RUN $PYTHON -m zipfile -e "protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" /usr/local && chmod 755 /usr/local/bin/protoc RUN $PYTHON -m zipfile -e "protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" /usr/local && chmod 755 /usr/local/bin/protoc
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ENV WORKON_HOME=/tmp/.venvs ENV WORKON_HOME=/tmp/.venvs
RUN $PYTHON -m pip install pipenv RUN $PYTHON -m pip install pipenv

View File

@ -11,7 +11,15 @@ RUN apt-get update && \
ENV PROTOBUF_VERSION=3.4.0 ENV PROTOBUF_VERSION=3.4.0
RUN curl -LO "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" RUN curl -LO "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protoc-${PROTOBUF_VERSION}-linux-x86_64.zip"
RUN unzip "protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" -d /usr
RUN pip3 install "protobuf==${PROTOBUF_VERSION}" ecdsa
RUN ln -s python3 /usr/bin/python ENV PYTHON=python3
# use zipfile module to extract files world-readable
RUN $PYTHON -m zipfile -e "protoc-${PROTOBUF_VERSION}-linux-x86_64.zip" /usr/local && chmod 755 /usr/local/bin/protoc
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ENV WORKON_HOME=/tmp/.venvs
RUN $PYTHON -m pip install "protobuf==${PROTOBUF_VERSION}" ecdsa click trezor mako munch