Skip to content

Commit c398ee8

Browse files
committed
Update install-cachelib-deps.sh to rebuild Docker
1 parent 139e2e9 commit c398ee8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

contrib/build-package.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ build_tests=
7878
show_help=
7979
many_jobs=
8080
verbose=
81-
install_path=
82-
while getopts :BSdhijtvI: param
81+
PREFIX="$PWD/opt/cachelib/"
82+
83+
while getopts :BSdhijtvp: param
8384
do
8485
case $param in
8586
i) install=yes ;;
@@ -90,7 +91,7 @@ do
9091
v) verbose=yes ;;
9192
j) many_jobs=yes ;;
9293
t) build_tests=yes ;;
93-
I) install_path=${OPTARG} ; install=yes ;;
94+
p) PREFIX=$OPTARG ;;
9495
?) die "unknown option. See -h for help."
9596
esac
9697
done
@@ -283,7 +284,6 @@ test -d cachelib || die "expected 'cachelib' directory not found in $PWD"
283284

284285

285286
# After ensuring we are in the correct directory, set the installation prefix"
286-
PREFIX=${install_path:-"$PWD/opt/cachelib/"}
287287
CMAKE_PARAMS="$CMAKE_PARAMS -DCMAKE_INSTALL_PREFIX=$PREFIX"
288288
CMAKE_PREFIX_PATH="$PREFIX/lib/cmake:$PREFIX/lib64/cmake:$PREFIX/lib:$PREFIX/lib64:$PREFIX:${CMAKE_PREFIX_PATH:-}"
289289
export CMAKE_PREFIX_PATH

docker/images/install-cachelib-deps.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
echo 'Defaults env_keep += "HTTPS_PROXY https_proxy HTTP_PROXY http_proxy NO_PROXY no_proxy"' >> /etc/sudoers
66
./contrib/prerequisites-centos8.sh
77

8-
for pkg in zstd googleflags googlelog googletest sparsemap fmt folly fizz wangle fbthrift ;
8+
for pkg in zstd googleflags googlelog googletest sparsemap fmt folly fizz wangle mvfst fbthrift ;
99
do
10-
sudo ./contrib/build-package.sh -j -I /opt/ "$pkg"
10+
sudo ./contrib/build-package.sh -j -p /opt/ "$pkg"
1111
done
1212

0 commit comments

Comments
 (0)