From 66d90a31afcd10ba0fe217c30a11a209f4be3511 Mon Sep 17 00:00:00 2001 From: Julio Perez Date: Tue, 26 Apr 2022 17:02:44 -0400 Subject: [PATCH 1/2] add args, ARG can only handle one arg at a time --- docker/inference/dockerfile.ctr | 18 +++++++++--------- docker/training/dockerfile.ctr | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docker/inference/dockerfile.ctr b/docker/inference/dockerfile.ctr index 7d647c69a..91fdb212c 100644 --- a/docker/inference/dockerfile.ctr +++ b/docker/inference/dockerfile.ctr @@ -238,13 +238,13 @@ RUN git clone https://github.com/NVIDIA-Merlin/nvtabular_triton_backend.git buil # ----------------------------------------------------------------------------- # HugeCTR + Dependencies -ARG HIREDIS_VER=1.0.2 \ - REDIS_PP_VER=1.3.3 \ - ROCKSDB_VER=6.29.3 \ - RDKAFKA_VER=1.8.2 \ - # Optional. - PROTOC_VER=3.19.4 \ - HADOOP_VER=3.3.2 +ARG HIREDIS_VER=1.0.2 +ARG REDIS_PP_VER=1.3.3 +ARG ROCKSDB_VER=6.29.3 +ARG RDKAFKA_VER=1.8.2 +# Optional. +ARG PROTOC_VER=3.19.4 +ARG HADOOP_VER=3.3.2 # Dependency: Build and install Redis native client. RUN git clone --branch v${HIREDIS_VER} --depth 1 https://github.com/redis/hiredis.git hiredis && \ @@ -283,8 +283,8 @@ RUN git clone --branch v${RDKAFKA_VER} --depth 1 https://github.com/edenhill/lib rm -rf rdkafka # Optional dependency: Build and install protocol buffers and Hadoop/HDFS. -ARG INSTALL_HDFS=false \ - BUILD_HADOOP=false +ARG INSTALL_HDFS=false +ARG BUILD_HADOOP=false RUN git clone --branch v${PROTOC_VER} --depth 1 https://github.com/protocolbuffers/protobuf.git protobuf && \ cd protobuf && \ diff --git a/docker/training/dockerfile.ctr b/docker/training/dockerfile.ctr index 386048ca4..55d6818ec 100644 --- a/docker/training/dockerfile.ctr +++ b/docker/training/dockerfile.ctr @@ -114,12 +114,12 @@ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https:// # HugeCTR + Dependencies ARG HIREDIS_VER=1.0.2 \ - REDIS_PP_VER=1.3.3 \ - ROCKSDB_VER=6.29.3 \ - RDKAFKA_VER=1.8.2 \ - # Optional. - PROTOC_VER=3.19.4 \ - HADOOP_VER=3.3.2 +ARG REDIS_PP_VER=1.3.3 \ +ARG ROCKSDB_VER=6.29.3 \ +ARG RDKAFKA_VER=1.8.2 \ +# Optional. +ARG PROTOC_VER=3.19.4 \ +ARG HADOOP_VER=3.3.2 # Dependency: Build and install Redis native client. RUN git clone --branch v${HIREDIS_VER} --depth 1 https://github.com/redis/hiredis.git hiredis && \ @@ -158,8 +158,8 @@ RUN git clone --branch v${RDKAFKA_VER} --depth 1 https://github.com/edenhill/lib rm -rf rdkafka # Optional dependency: Build and install protocol buffers and Hadoop/HDFS. -ARG INSTALL_HDFS=false \ - BUILD_HADOOP=false +ARG INSTALL_HDFS=false +ARG BUILD_HADOOP=false RUN git clone --branch v${PROTOC_VER} --depth 1 https://github.com/protocolbuffers/protobuf.git protobuf && \ cd protobuf && \ From 7e43d7fd911b28c0f84f8f47402036cfb2b5ea56 Mon Sep 17 00:00:00 2001 From: Julio Perez Date: Tue, 26 Apr 2022 17:10:40 -0400 Subject: [PATCH 2/2] remove unnecessary slashes on ARGs --- docker/training/dockerfile.ctr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/training/dockerfile.ctr b/docker/training/dockerfile.ctr index 55d6818ec..857725ba2 100644 --- a/docker/training/dockerfile.ctr +++ b/docker/training/dockerfile.ctr @@ -113,12 +113,12 @@ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https:// # ----------------------------------------------------------------------------- # HugeCTR + Dependencies -ARG HIREDIS_VER=1.0.2 \ -ARG REDIS_PP_VER=1.3.3 \ -ARG ROCKSDB_VER=6.29.3 \ -ARG RDKAFKA_VER=1.8.2 \ +ARG HIREDIS_VER=1.0.2 +ARG REDIS_PP_VER=1.3.3 +ARG ROCKSDB_VER=6.29.3 +ARG RDKAFKA_VER=1.8.2 # Optional. -ARG PROTOC_VER=3.19.4 \ +ARG PROTOC_VER=3.19.4 ARG HADOOP_VER=3.3.2 # Dependency: Build and install Redis native client.