arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 15:38:11 +00:00
Code Issues Releases Wiki Activity

core: fix docker build

Browse Source
This commit is contained in:
Pavol Rusnak 2019-04-30 13:13:57 +02:00
parent 4672993393
commit 4b8c418dbc
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Pipfile.lock generated
View File

@ -247,9 +247,9 @@
}, },
"inform": { "inform": {
"hashes": [ "hashes": [
"sha256:15814162c32cb245395234767dc6996e13f32623dbaffd94c22af2eab57644b3" "sha256:9fa86429435552ecba03eeae34fb2864049b16ad59ac888cb125e49f9ad36632"
], ],
"version": "==1.15.0" "version": "==1.16.0"
}, },
"isort": { "isort": {
"hashes": [ "hashes": [
@ -381,10 +381,10 @@
}, },
"pbr": { "pbr": {
"hashes": [ "hashes": [
"sha256:8257baf496c8522437e8a6cfe0f15e00aedc6c0e0e7c9d55eeeeab31e0853843", "sha256:6901995b9b686cb90cceba67a0f6d4d14ae003cd59bc12beb61549bdfbe3bc89",
"sha256:8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824" "sha256:d950c64aeea5456bbd147468382a5bb77fe692c13c9f00f0219814ce5b642755"
], ],
"version": "==5.1.3" "version": "==5.2.0"
}, },
"pep8": { "pep8": {
"hashes": [ "hashes": [

2
ci/Dockerfile
View File

@ -9,7 +9,7 @@ ENV TOOLCHAIN_FLAVOR=$TOOLCHAIN_FLAVOR
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential wget git libsodium-dev graphviz \ build-essential wget git libsodium-dev graphviz \
valgrind check libssl-dev libusb-1.0-0-dev libudev-dev valgrind check libssl-dev libusb-1.0-0-dev libudev-dev zlib1g-dev
# TODO are all apt packages actually needed? # TODO are all apt packages actually needed?

3
core/build-docker.sh
View File

@ -34,4 +34,5 @@ docker run -t -v $(pwd):/local -v $(pwd)/build/core:/build:z --user="$USER:$GROU
ln -s /build build && ln -s /build build &&
git checkout $TAG && \ git checkout $TAG && \
git submodule update --init --recursive && \ git submodule update --init --recursive && \
PRODUCTION=$PRODUCTION make clean vendor build_boardloader build_bootloader build_firmware" pipenv install && \
PRODUCTION=$PRODUCTION pipenv run make clean vendor build_boardloader build_bootloader build_firmware"

2
shell.nix
View File

@ -30,10 +30,12 @@ in
gnumake gnumake
graphviz graphviz
openssl openssl
pipenv
pkgconfig pkgconfig
protobuf protobuf
python2Packages.demjson python2Packages.demjson
scons scons
valgrind valgrind
zlib
]; ];
} }