docker file arguments improved

Author: filippomc

Dockerfile

@@ -1,12 +1,19 @@
 FROM frodriguez4600/jupyter-neuron:v7.8.0
+ARG INSTALLATION_FOLDER=/home/jovyan/work/NetPyNE-UI
+ARG NETPYNE_VERSION=development
+ARG WORKSPACE_VERSION=nov2020
+ARG JUPYTER_GEPPETTO_VERSION=development
+ARG PYGEPPETTO_VERSION=development
+ARG BUILD_ARGS=""
+
 USER $NB_USER
 
-ENV INSTALLATION_FOLDER=/home/jovyan/work/NetPyNE-UI
-ENV NETPYNE_VERSION=development
+ENV INSTALLATION_FOLDER=$INSTALLATION_FOLDER
+ENV NETPYNE_VERSION=$NETPYNE_VERSION
 ENV WORKSPACE_VERSION=nov2020
-ENV JUPYTER_GEPPETTO_VERSION=development
-ENV PYGEPPETTO_VERSION=development
-ENV BUILD_ARGS=""
+ENV JUPYTER_GEPPETTO_VERSION=$WORKSPACE_VERSION
+ENV PYGEPPETTO_VERSION=$PYGEPPETTO_VERSION
+ENV BUILD_ARGS=$BUILD_ARGS
 
 WORKDIR /home/jovyan/work
 COPY --chown=1000:1000 requirements.txt ${INSTALLATION_FOLDER}/requirements.txt

k8s/cf_pipeline.yaml

@@ -63,8 +63,6 @@ steps:
       custom_values:
         - 'hub_image_tag=${{CF_SHORT_REVISION}}'
         - 'singleuser_image_tag=${{CF_SHORT_REVISION}}'
-        - 'singleuser_cpu_limit=${{CPU_MAX}}'
-        - 'singleuser_cpu_guarantee=${{CPU_MIN}}'
         - 'singleuser_memory_limit=${{MEMORY_MAX}}'
         - 'singleuser_memory_guarantee=${{MEMORY_MIN}}'
         - 'proxy_secretToken=${{SECRET_TOKEN}}'