arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-01 18:30:56 +00:00
Code Issues Releases Wiki Activity

docker: don't run docker with --user, use chown instead

Browse Source
This commit is contained in:
Pavol Rusnak 2020-06-03 23:45:53 +02:00
parent 1d68c9b386
commit 38c80a019f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build-docker.sh
View File

@ -34,7 +34,6 @@ for BITCOIN_ONLY in 0 1; do
-v $(pwd)/build/core"${DIRSUFFIX}":/build:z \ -v $(pwd)/build/core"${DIRSUFFIX}":/build:z \
--env BITCOIN_ONLY="$BITCOIN_ONLY" \ --env BITCOIN_ONLY="$BITCOIN_ONLY" \
--env PRODUCTION="$PRODUCTION" \ --env PRODUCTION="$PRODUCTION" \
--user="$USER:$GROUP" \
"$IMAGE" \ "$IMAGE" \
/nix/var/nix/profiles/default/bin/nix-shell --run "\ /nix/var/nix/profiles/default/bin/nix-shell --run "\
cd /tmp && \ cd /tmp && \
@ -44,7 +43,8 @@ for BITCOIN_ONLY in 0 1; do
git checkout $TAG && \ git checkout $TAG && \
git submodule update --init --recursive && \ git submodule update --init --recursive && \
pipenv install && \ pipenv install && \
pipenv run make clean vendor build_firmware" pipenv run make clean vendor build_firmware && \
chown -R $USER:$GROUP /build"
done done
@ -60,7 +60,6 @@ for BITCOIN_ONLY in 0 1; do
-v $(pwd)/build/legacy"${DIRSUFFIX}":/build:z \ -v $(pwd)/build/legacy"${DIRSUFFIX}":/build:z \
--env BITCOIN_ONLY="$BITCOIN_ONLY" \ --env BITCOIN_ONLY="$BITCOIN_ONLY" \
--env MEMORY_PROTECT="$MEMORY_PROTECT" \ --env MEMORY_PROTECT="$MEMORY_PROTECT" \
--user="$USER:$GROUP" \
"$IMAGE" \ "$IMAGE" \
/nix/var/nix/profiles/default/bin/nix-shell --run "\ /nix/var/nix/profiles/default/bin/nix-shell --run "\
cd /tmp && \ cd /tmp && \
@ -73,6 +72,7 @@ for BITCOIN_ONLY in 0 1; do
pipenv run script/cibuild && \ pipenv run script/cibuild && \
mkdir -p build/firmware && \ mkdir -p build/firmware && \
cp firmware/trezor.bin build/firmware/firmware.bin && \ cp firmware/trezor.bin build/firmware/firmware.bin && \
cp firmware/trezor.elf build/firmware/firmware.elf" cp firmware/trezor.elf build/firmware/firmware.elf && \
chown -R $USER:$GROUP /build"
done done