artifact fetch fix (#746)

Author: chayim

.circleci/config.yml

@@ -529,8 +529,8 @@ workflows:
                 - xenial
                 - bionic
               lite:
-                - "LITE=0"
-                - "LITE=1"
+                - "REDISAI_LITE=0"
+                - "REDISAI_LITE=1"
               target:
                 - "CPU=1"
                 - "GPU=1"

Dockerfile

@@ -12,6 +12,7 @@ ARG OS=debian:buster-slim
 ARG ARCH=x64
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
@@ -43,11 +44,12 @@ ADD ./ /build
 RUN bash -l -c "make -C opt build $BUILD_ARGS SHOW=1"
 
 ARG PACK
+ARG REDISAI_LITE
 ARG TEST
 
 RUN mkdir -p bin/artifacts
 RUN set -e ;\
-    if [ "$PACK" = "1" ]; then bash -l -c "make -C opt pack"; fi
+    if [ "$PACK" = "1" ]; then bash -l -c "make -C opt pack REDISAI_LITE=$REDISAI_LITE"; fi
 
 RUN set -e ;\
     if [ "$TEST" = "1" ]; then \

Dockerfile.arm

@@ -12,6 +12,7 @@ ARG OS=debian:buster-slim
 ARG ARCH=arm64v8
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
@@ -66,7 +67,7 @@ ARG REDIS_VER
 ARG PACK
 
 RUN if [ ! -z $(command -v apt-get) ]; then apt-get -qq update; apt-get -q install -y libgomp1; fi
-RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi 
+RUN if [ ! -z $(command -v yum) ]; then yum install -y libgomp; fi
 
 ENV REDIS_MODULES /usr/lib/redis/modules
 ENV LD_LIBRARY_PATH $REDIS_MODULES

Dockerfile.gpu

@@ -14,6 +14,7 @@ ARG ARCH=x64
 ARG CUDA_VER=11.0-cudnn8
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
@@ -51,11 +52,12 @@ ADD ./ /build
 RUN bash -l -c "make -C opt build GPU=1 $BUILD_ARGS SHOW=1"
 
 ARG PACK
+ARG REDISAI_LITE
 ARG TEST
 
 RUN mkdir -p bin/artifacts
 RUN set -e ;\
-    if [ "$PACK" = "1" ]; then bash -l -c "make -C opt pack GPU=1"; fi
+    if [ "$PACK" = "1" ]; then bash -l -c "make -C opt pack GPU=1 REDISAI_LITE=$REDISAI_LITE"; fi
 
 RUN set -e ;\
     if [ "$TEST" = "1" ]; then \

Dockerfile.jetson

@@ -16,6 +16,7 @@ ARG CUDA_VER=10.2-cudnn7
 ARG L4T_VER=r32.4.4
 
 ARG PACK=0
+ARG REDISAI_LITE=0
 ARG TEST=0
 
 #----------------------------------------------------------------------------------------------
@@ -57,6 +58,7 @@ RUN bash -c "set -e ;\
     make -C opt build  $BUILD_ARGS SHOW=1"
 
 ARG PACK
+ARG REDISAI_LITE
 ARG TEST
 
 RUN mkdir -p bin/artifacts

opt/build/docker/Makefile

@@ -16,6 +16,9 @@ REDIS_VER:=6.0.9
 export ART_DIR=$(ROOT)/bin/artifacts
 export ART_INT_DIR=/var/opt/redislabs/artifacts
 
+DOCKER_BUILD_ARGS=\
+	REDISAI_LITE=$(REDISAI_LITE)
+
 #----------------------------------------------------------------------------------------------
 
 ifeq ($(CPU),1)