Update dependencies (#95)

* Set dependencies to working versions

and use dependencies from build context, instead
of downloading cachelib:develop during build step.

This makes sure that dependencies are always build
in proper versions.

* Fix CacheStats size

.github/workflows/build-cachelib-docker.yml

@@ -40,6 +40,7 @@ jobs:
       - name: "checkout sources"
         uses: actions/checkout@v2
         with:
+          submodules: recursive
           fetch-depth: 0
 
       - name: Pull the image or rebuild and push it

cachelib/allocator/CacheStats.cpp

@@ -57,7 +57,7 @@ struct SizeVerify {};
 
 void Stats::populateGlobalCacheStats(GlobalCacheStats& ret) const {
 #ifndef SKIP_SIZE_VERIFY
-  SizeVerify<sizeof(Stats)> a = SizeVerify<16192>{};
+  SizeVerify<sizeof(Stats)> a = SizeVerify<16544>{};
   std::ignore = a;
 #endif
   ret.numCacheGets = numCacheGets.get();

contrib/build-package.sh

@@ -197,7 +197,6 @@ case "$1" in
   folly)
     NAME=folly
     SRCDIR=cachelib/external/$NAME
-    update_submodules=yes
     cmake_custom_params="-DBUILD_SHARED_LIBS=ON"
     if test "$build_tests" = "yes" ; then
         cmake_custom_params="$cmake_custom_params -DBUILD_TESTS=ON"
@@ -209,7 +208,6 @@ case "$1" in
   fizz)
     NAME=fizz
     SRCDIR=cachelib/external/$NAME/$NAME
-    update_submodules=yes
     cmake_custom_params="-DBUILD_SHARED_LIBS=ON"
     if test "$build_tests" = "yes" ; then
         cmake_custom_params="$cmake_custom_params -DBUILD_TESTS=ON"
@@ -221,7 +219,6 @@ case "$1" in
   wangle)
     NAME=wangle
     SRCDIR=cachelib/external/$NAME/$NAME
-    update_submodules=yes
     cmake_custom_params="-DBUILD_SHARED_LIBS=ON"
     if test "$build_tests" = "yes" ; then
         cmake_custom_params="$cmake_custom_params -DBUILD_TESTS=ON"
@@ -233,7 +230,6 @@ case "$1" in
   fbthrift)
     NAME=fbthrift
     SRCDIR=cachelib/external/$NAME
-    update_submodules=yes
     cmake_custom_params="-DBUILD_SHARED_LIBS=ON"
     ;;
 

docker/images/build-image.sh

@@ -35,4 +35,4 @@ echo "Build a Docker image tagged with: ${CONTAINER_REG}:${TAG}"
 docker build -t ${CONTAINER_REG}:${TAG} \
 	--build-arg http_proxy=$http_proxy \
 	--build-arg https_proxy=$https_proxy \
-	-f ${OS}-${OS_VER}.Dockerfile .
+	-f ${OS}-${OS_VER}.Dockerfile ../.. # need access to contrib and submodules

docker/images/centos-8streams.Dockerfile

@@ -23,8 +23,9 @@ RUN dnf -y install gcc-toolset-12
 RUN echo "source /opt/rh/gcc-toolset-12/enable" >> /etc/bashrc
 SHELL ["/bin/bash", "--login", "-c"]
 
-COPY ./install-cachelib-deps.sh ./install-cachelib-deps.sh
-RUN ./install-cachelib-deps.sh
+COPY ./contrib ./contrib
+COPY ./docker ./docker
+COPY ./cachelib/external ./cachelib/external
 
-COPY ./install-dsa-deps.sh ./install-dsa-deps.sh
-RUN ./install-dsa-deps.sh
+RUN ./docker/images/install-cachelib-deps.sh
+RUN ./docker/images/install-dsa-deps.sh

docker/images/install-cachelib-deps.sh

@@ -2,13 +2,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2022, Intel Corporation
 
-git clone -b develop https://github.com/intel/CacheLib CacheLib
-
-./CacheLib/contrib/prerequisites-centos8.sh
+echo 'Defaults env_keep += "HTTPS_PROXY https_proxy HTTP_PROXY http_proxy NO_PROXY no_proxy"' >> /etc/sudoers
+./contrib/prerequisites-centos8.sh
 
 for pkg in zstd googleflags googlelog googletest sparsemap fmt folly fizz wangle fbthrift ;
 do
-    sudo ./CacheLib/contrib/build-package.sh -j -I /opt/ "$pkg"
+    sudo ./contrib/build-package.sh -j -I /opt/ "$pkg"
 done
 
-rm -rf CacheLib

docker/images/install-dsa-deps.sh

@@ -15,7 +15,7 @@ rm -rf idxd-config
 # Install DML Library
 git clone --recursive https://github.com/intel/DML.git
 cd DML
-git checkout e44443c24d53552b248b9869b1b16f89cd970f52
+git checkout v1.1.0
 mkdir build
 cd build
 cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo ..