Skip to content

Commit 143f070

Browse files
author
Jason Mobarak
committed
Fix docker image naming
1 parent f06316b commit 143f070

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

build_example.bash

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
1111
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
1212

13+
DOCKER_NAMETAG=swiftnav/arm-llvm-obf:4.0
14+
1315
mkdir -p build
1416
mkdir -p output/opt
1517

1618
docker run -i -t --rm \
1719
-v $PWD/example:/work/example \
1820
-v $PWD/build:/work/build \
1921
-v $PWD/output/opt:/opt \
20-
arm-llvm-obf:base \
22+
$DOCKER_NAMETAG \
2123
/bin/bash -c "export PATH=/opt/llvm-obfuscator/bin:/opt/llvm-obfuscator/wrappers/bin:\$PATH; \
2224
make -C example"

run_build_shell.bash

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
# EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED
1111
# WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE.
1212

13+
DOCKER_NAMETAG=swiftnav/arm-llvm-obf:4.0
14+
1315
mkdir -p build
1416
mkdir -p output/opt
1517

@@ -19,5 +21,5 @@ docker run -i -t --rm \
1921
-v $PWD/output/opt:/opt \
2022
-v $PWD/bin:/wrapper-bin \
2123
-v $PWD/patches:/patches \
22-
arm-llvm-obf:base \
24+
$DOCKER_NAMETAG \
2325
/bin/bash -c "export PATH=/opt/llvm-obfuscator/bin:/wrapper-bin:\$PATH; exec /bin/bash"

stage_sysroot.bash

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
set -x
1414

15+
DOCKER_NAMETAG=swiftnav/arm-llvm-obf:4.0
16+
1517
stage_sysroot() {
1618

1719
OUT=/opt/llvm-obfuscator/sysroot
@@ -77,7 +79,7 @@ run() {
7779
-v $PWD/output/opt:/opt \
7880
-v $PWD:/this_dir \
7981
-e DOCKERCEPTION=1 \
80-
arm-llvm-obf:base \
82+
$DOCKER_NAMETAG \
8183
/bin/bash -c ". /this_dir/stage_sysroot.bash; stage_sysroot"
8284
}
8385

0 commit comments

Comments
 (0)