Merge pull request #59 from ramongduraes/daemon-downloading-script

Updating daemon downloading script for all services
singnet · Apr 8, 2019 · f53c2b7 · f53c2b7
2 parents 8b5fe5d + c843817
commit f53c2b7
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 60 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,9 +20,6 @@ commands:
       docker_mount_dest:
         type: string
         default: ""
-      docker_snetd_version:
-        type: string
-        default: "v0.1.8"
     steps:
       - run:
           name: Removing old Docker Container (Previous Builds)
@@ -44,7 +41,6 @@ commands:
             export DOCKER_MOUNT_VOLUMES=<< parameters.docker_mount_volumes >>
             export DOCKER_MOUNT_SRC=<< parameters.docker_mount_src >>
             export DOCKER_MOUNT_DEST=<< parameters.docker_mount_dest >>
-            export SNETD_VERSION=<< parameters.docker_snetd_version >>
             export PROD_TAG=$([ "${CIRCLE_PROJECT_USERNAME}" = "singnet" ] && echo "PROD_" || echo "")
             echo            git_user  : ${CIRCLE_PROJECT_USERNAME}
             echo            git_repo  : ${CIRCLE_PROJECT_REPONAME}
@@ -57,7 +53,6 @@ commands:
             echo DOCKER_MOUNT_VOLUMES : ${DOCKER_MOUNT_VOLUMES}
             echo DOCKER_MOUNT_SRC     : ${DOCKER_MOUNT_SRC}
             echo DOCKER_MOUNT_DEST    : ${DOCKER_MOUNT_DEST}
-            echo SNETD_VERSION        : ${SNETD_VERSION}
             echo "======================================================================================================================"
 
             ssh -o "StrictHostKeyChecking no" ${SSH_USER}@${SSH_HOST} \<< EOF
@@ -66,7 +61,6 @@ commands:
                 --build-arg git_owner=${CIRCLE_PROJECT_USERNAME} \
                 --build-arg git_repo=${CIRCLE_PROJECT_REPONAME} \
                 --build-arg git_branch=${CIRCLE_BRANCH} \
-                --build-arg snetd_version=${SNETD_VERSION} \
                 -t ${DOCKER_IMAGE_NAME}:${CIRCLE_PROJECT_USERNAME} https://raw.githubusercontent.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/${CIRCLE_BRANCH}/${SERVICE_FOLDER}/Dockerfile
               docker run \
                 $([ "${DOCKER_NVIDIA}" = "true" ] && echo "--runtime=nvidia" || echo "") \
@@ -122,9 +116,6 @@ commands:
       docker_mount_dest:
         type: string
         default: ""
-      docker_snetd_version:
-        type: string
-        default: "v0.1.8"
     steps:
       - run:
           name: Removing old Docker Container (Previous Builds)
@@ -149,7 +140,6 @@ commands:
             export DOCKER_MOUNT_DEST=<< parameters.docker_mount_dest >>
             export ETCD_HOST_FOLDER=<< parameters.docker_etcd_host_folder >>
             export ETCD_CONTAINER_FOLDER=<< parameters.docker_etcd_container_folder >>
-            export SNETD_VERSION=<< parameters.docker_snetd_version >>
             export PROD_TAG=$([ "${DOCKER_DEPLOY}" = "true" ] && echo "PROD_" || echo "")
             echo            git_user  : ${CIRCLE_PROJECT_USERNAME}
             echo            git_repo  : ${CIRCLE_PROJECT_REPONAME}
@@ -165,7 +155,6 @@ commands:
             echo DOCKER_MOUNT_DEST    : ${DOCKER_MOUNT_DEST}
             echo ETCD_HOST_FOLDER     : ${ETCD_HOST_FOLDER}
             echo ETCD_CONTAINER_FOLDER: ${ETCD_CONTAINER_FOLDER}
-            echo SNETD_VERSION        : ${SNETD_VERSION}
             echo CERTS_FOLDER         : ${CERTS_FOLDER}
             echo "======================================================================================================================"
 
@@ -177,7 +166,6 @@ commands:
                     --build-arg git_owner=${CIRCLE_PROJECT_USERNAME} \
                     --build-arg git_repo=${CIRCLE_PROJECT_REPONAME} \
                     --build-arg git_branch=${CIRCLE_BRANCH} \
-                    --build-arg snetd_version=${SNETD_VERSION} \
                     -t ${DOCKER_IMAGE_NAME}:${CIRCLE_PROJECT_USERNAME} https://raw.githubusercontent.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}/${CIRCLE_BRANCH}/${SERVICE_FOLDER}/Dockerfile
                     docker run \
                     $([ "${DOCKER_NVIDIA}" = "true" ] && echo "--runtime=nvidia" || echo "") \

diff --git a/services/cntk-image-recon/Dockerfile b/services/cntk-image-recon/Dockerfile
@@ -3,7 +3,6 @@ FROM microsoft/cntk:latest
 ARG git_owner="singnet"
 ARG git_repo="dnn-model-services"
 ARG git_branch="master"
-ARG snetd_version
 
 ENV SINGNET_REPOS=/opt/singnet
 ENV DNN_REPO_NAME=${git_repo}
@@ -16,14 +15,14 @@ RUN apt-get update && \
     apt-get install -y \
     git \
     wget \
-    nano
-
-RUN cd ${SINGNET_REPOS} && \
-    mkdir snet-daemon && \
-    cd snet-daemon && \
-    wget https://github.com/singnet/snet-daemon/releases/download/${snetd_version}/snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    tar -xvf snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    mv snet-daemon-${snetd_version}-linux-amd64/snetd /usr/bin/snetd
+    nano \
+    curl
+
+RUN SNETD_VERSION=`curl -s https://api.github.com/repos/singnet/snet-daemon/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` && \
+    cd /tmp && \
+    wget https://github.com/singnet/snet-daemon/releases/download/${SNETD_VERSION}/snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    tar -xvf snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    mv snet-daemon-${SNETD_VERSION}-linux-amd64/snetd /usr/bin/snetd
 
 RUN cd ${SINGNET_REPOS} && \
     git clone -b ${git_branch} https://github.com/${git_owner}/${DNN_REPO_NAME}.git && \

diff --git a/services/i3d-video-action-recognition/Dockerfile b/services/i3d-video-action-recognition/Dockerfile
@@ -3,7 +3,6 @@ FROM ubuntu:18.04
 ARG git_owner="singnet"
 ARG git_repo="dnn-model-services"
 ARG git_branch="master"
-ARG snetd_version
 
 ENV SINGNET_REPOS=/opt/singnet
 ENV DNN_REPO_NAME=${git_repo}
@@ -16,19 +15,19 @@ RUN apt-get update && \
     apt-get install -y \
     git \
     wget \
-    nano
+    nano \
+    curl
 
 # OpenCV dependencies
 RUN apt-get install -y libsm6 libxext6 libxrender-dev
 
 RUN apt-get install -y python3 python3-pip
 
-RUN cd ${SINGNET_REPOS} && \
-    mkdir snet-daemon && \
-    cd snet-daemon && \
-    wget https://github.com/singnet/snet-daemon/releases/download/${snetd_version}/snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    tar -xvf snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    mv snet-daemon-${snetd_version}-linux-amd64/snetd /usr/bin/snetd
+RUN SNETD_VERSION=`curl -s https://api.github.com/repos/singnet/snet-daemon/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` && \
+    cd /tmp && \
+    wget https://github.com/singnet/snet-daemon/releases/download/${SNETD_VERSION}/snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    tar -xvf snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    mv snet-daemon-${SNETD_VERSION}-linux-amd64/snetd /usr/bin/snetd
 
 RUN cd ${SINGNET_REPOS} && \
     git clone -b ${git_branch} https://github.com/${git_owner}/${DNN_REPO_NAME}.git

diff --git a/services/places365-scene-recognition/Dockerfile b/services/places365-scene-recognition/Dockerfile
@@ -3,7 +3,6 @@ FROM pytorch/pytorch:0.4.1-cuda9-cudnn7-runtime
 ARG git_owner="singnet"
 ARG git_repo="dnn-model-services"
 ARG git_branch="master"
-ARG snetd_version
 
 ENV SINGNET_REPOS=/opt/singnet
 ENV DNN_REPO_NAME=${git_repo}
@@ -16,6 +15,7 @@ RUN mkdir -p ${SINGNET_REPOS}
 RUN apt-get update && \
     apt-get install -y \
     wget \
+    curl \
     git \
     libglib2.0-0 \
     libsm6 \
@@ -25,12 +25,11 @@ RUN apt-get update && \
     pip install --upgrade pip
 
 # Installing SNET Daemon
-RUN cd ${SINGNET_REPOS} && \
-    mkdir snet-daemon && \
-    cd snet-daemon && \
-    wget https://github.com/singnet/snet-daemon/releases/download/${snetd_version}/snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    tar -xvf snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    mv snet-daemon-${snetd_version}-linux-amd64/snetd /usr/bin/snetd
+RUN SNETD_VERSION=`curl -s https://api.github.com/repos/singnet/snet-daemon/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` && \
+    cd /tmp && \
+    wget https://github.com/singnet/snet-daemon/releases/download/${SNETD_VERSION}/snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    tar -xvf snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    mv snet-daemon-${SNETD_VERSION}-linux-amd64/snetd /usr/bin/snetd
 
 # Cloning service repository, downloading models
 RUN cd ${SINGNET_REPOS} && \

diff --git a/services/s2vt-video-captioning/Dockerfile b/services/s2vt-video-captioning/Dockerfile
@@ -3,7 +3,6 @@ FROM bvlc/caffe:gpu
 ARG git_owner="singnet"
 ARG git_repo="dnn-model-services"
 ARG git_branch="master"
-ARG snetd_version
 
 ENV SINGNET_REPOS=/opt/singnet
 ENV DNN_REPO_NAME=${git_repo}
@@ -17,17 +16,17 @@ RUN apt-get update && \
     git \
     wget \
     nano \
-    python-tk
+    python-tk \
+    curl
 
 # Caffe dependencies
 RUN apt-get install -y libsm6 libxext6 libxrender-dev
 
-RUN cd ${SINGNET_REPOS} && \
-    mkdir snet-daemon && \
-    cd snet-daemon && \
-    wget https://github.com/singnet/snet-daemon/releases/download/${snetd_version}/snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    tar -xvf snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    mv snet-daemon-${snetd_version}-linux-amd64/snetd /usr/bin/snetd
+RUN SNETD_VERSION=`curl -s https://api.github.com/repos/singnet/snet-daemon/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` && \
+    cd /tmp && \
+    wget https://github.com/singnet/snet-daemon/releases/download/${SNETD_VERSION}/snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    tar -xvf snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    mv snet-daemon-${SNETD_VERSION}-linux-amd64/snetd /usr/bin/snetd
 
 RUN cd ${SINGNET_REPOS} && \
     git clone -b ${git_branch} https://github.com/${git_owner}/${DNN_REPO_NAME}.git && \

diff --git a/services/yolov3-object-detection/Dockerfile b/services/yolov3-object-detection/Dockerfile
@@ -3,7 +3,6 @@ FROM ubuntu:18.04
 ARG git_owner="singnet"
 ARG git_repo="dnn-model-services"
 ARG git_branch="master"
-ARG snetd_version
 
 ENV SINGNET_REPOS=/opt/singnet
 ENV DNN_REPO_NAME=${git_repo}
@@ -16,19 +15,19 @@ RUN apt-get update && \
     apt-get install -y \
     git \
     wget \
-    nano
+    nano \
+    curl
 
 # OpenCV dependencies
 RUN apt-get install -y libsm6 libxext6 libxrender-dev
 
 RUN apt-get install -y python3 python3-pip
 
-RUN cd ${SINGNET_REPOS} && \
-    mkdir snet-daemon && \
-    cd snet-daemon && \
-    wget https://github.com/singnet/snet-daemon/releases/download/${snetd_version}/snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    tar -xvf snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    mv snet-daemon-${snetd_version}-linux-amd64/snetd /usr/bin/snetd
+RUN SNETD_VERSION=`curl -s https://api.github.com/repos/singnet/snet-daemon/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` && \
+    cd /tmp && \
+    wget https://github.com/singnet/snet-daemon/releases/download/${SNETD_VERSION}/snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    tar -xvf snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    mv snet-daemon-${SNETD_VERSION}-linux-amd64/snetd /usr/bin/snetd
 
 RUN cd ${SINGNET_REPOS} && \
     git clone -b ${git_branch} https://github.com/${git_owner}/${DNN_REPO_NAME}.git && \

diff --git a/services/zeta36-chess-alpha-zero/Dockerfile b/services/zeta36-chess-alpha-zero/Dockerfile
@@ -3,7 +3,6 @@ FROM nvidia/cuda:8.0-cudnn6-runtime-ubuntu16.04
 ARG git_owner="singnet"
 ARG git_repo="dnn-model-services"
 ARG git_branch="master"
-ARG snetd_version
 
 ENV SINGNET_REPOS=/opt/singnet
 ENV DNN_REPO_NAME=${git_repo}
@@ -18,7 +17,8 @@ RUN apt-get update && \
     libgomp1 \
     git \
     wget \
-    nano
+    nano \
+    curl
 
 RUN add-apt-repository ppa:deadsnakes/ppa && \
     apt-get update && \
@@ -29,12 +29,11 @@ RUN cd ${SINGNET_REPOS} && \
     python3.6 get-pip.py && \
     rm -f get-pip.py
 
-RUN cd ${SINGNET_REPOS} && \
-    mkdir snet-daemon && \
-    cd snet-daemon && \
-    wget https://github.com/singnet/snet-daemon/releases/download/${snetd_version}/snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    tar -xvf snet-daemon-${snetd_version}-linux-amd64.tar.gz && \
-    mv snet-daemon-${snetd_version}-linux-amd64/snetd /usr/bin/snetd
+RUN SNETD_VERSION=`curl -s https://api.github.com/repos/singnet/snet-daemon/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` && \
+    cd /tmp && \
+    wget https://github.com/singnet/snet-daemon/releases/download/${SNETD_VERSION}/snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    tar -xvf snet-daemon-${SNETD_VERSION}-linux-amd64.tar.gz && \
+    mv snet-daemon-${SNETD_VERSION}-linux-amd64/snetd /usr/bin/snetd
 
 RUN cd ${SINGNET_REPOS} && \
     git clone -b ${git_branch} https://github.com/${git_owner}/${DNN_REPO_NAME}.git