Merge pull request #264 from MetaCell/improve-dockerfile

Improve dockerfile

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 WORKSPACE_VERSION=nov2020
-ENV JUPYTER_GEPPETTO_VERSION=development
-ENV PYGEPPETTO_VERSION=development
-ENV BUILD_ARGS=""
+ENV INSTALLATION_FOLDER=$INSTALLATION_FOLDER
+ENV NETPYNE_VERSION=$NETPYNE_VERSION
+ENV WORKSPACE_VERSION=$WORKSPACE_VERSION
+ENV JUPYTER_GEPPETTO_VERSION=$JUPYTER_GEPPETTO_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

@@ -10,40 +10,28 @@ steps:
     repo: "MetaCell/NetPyNE-UI"
     revision: "${{CF_BRANCH}}"
     stage: "clone"
-    when:
-      branch:
-        only:
-          - "${{CF_BRANCH}}"
   BuildingNetPyNE-UI:
     title: Building NetPyNE-UI
     type: build
     stage: build
     image_name: netpyne-ui
     working_directory: ${{main_clone}}
-    tag: '${{CF_SHORT_REVISION}}'
+    tag: '${{CF_BRANCH_TAG_NORMALIZED}}-${{CF_SHORT_REVISION}}-${{CF_BUILD_TIMESTAMP}}'
     build_arguments:
       - NETPYNE_VERSION=${{NETPYNE_VERSION}}
       - WORKSPACE_VERSION=${{WORKSPACE_VERSION}}
       - PYGEPPETTO_VERSION=${{PYGEPPETTO_VERSION}}
       - JUPYTER_GEPPETTO_VERSION=${{JUPYTER_GEPPETTO_VERSION}}
       - BUILD_ARGS=${{BUILD_ARGS}}
     registry: ${{REGISTRY}}
-    when:
-      branch:
-        only:
-          - "${{CF_BRANCH}}"
   BuildingHub:
     title: Building Hub
     type: build
     stage: "build"
     image_name: netpyne-hub
     working_directory: k8s
-    tag: '${{CF_SHORT_REVISION}}'
+    tag: '${{CF_BRANCH_TAG_NORMALIZED}}-${{CF_SHORT_REVISION}}-${{CF_BUILD_TIMESTAMP}}'
     registry: ${{REGISTRY}}
-    when:
-      branch:
-        only:
-          - "${{CF_BRANCH}}"
   installing_chart:
     type: helm
     stage: deploy
@@ -61,10 +49,8 @@ steps:
       custom_value_files: 
         - 'cf_values.yaml'
       custom_values:
-        - 'hub_image_tag=${{CF_SHORT_REVISION}}'
-        - 'singleuser_image_tag=${{CF_SHORT_REVISION}}'
-        - 'singleuser_cpu_limit=${{CPU_MAX}}'
-        - 'singleuser_cpu_guarantee=${{CPU_MIN}}'
+        - 'hub_image_tag=${{CF_BRANCH_TAG_NORMALIZED}}-${{CF_SHORT_REVISION}}-${{CF_BUILD_TIMESTAMP}}'
+        - 'singleuser_image_tag=${{CF_BRANCH_TAG_NORMALIZED}}-${{CF_SHORT_REVISION}}-${{CF_BUILD_TIMESTAMP}}'
         - 'singleuser_memory_limit=${{MEMORY_MAX}}'
         - 'singleuser_memory_guarantee=${{MEMORY_MIN}}'
         - 'proxy_secretToken=${{SECRET_TOKEN}}'