Merge branch 'master' of renkulab.io:data-lakes/data/level_0/00001_lexploremeteostation

.gitlab-ci.yml

@@ -5,6 +5,9 @@ variables:
   GIT_SSL_NO_VERIFY: "true"
   GIT_SUBMODULE_STRATEGY: recursive
   GIT_LFS_SKIP_SMUDGE: 1
+  IMAGE_COMMIT: 15b9c35 # Need to be updated when image_build is run. Should be the first 7 digits of the commit ID from the image_build
+  SUB_MODULE: 'data/Level_0/00001_LexploreMeteostation'
+  
 
 stages:
   - build
@@ -20,15 +23,25 @@ image_build:
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA_7
   tags:
     - image-build
-
-dot:
+  only:
+    changes:
+      - Dockerfile
+      - requirements.txt
+      
+scripts:
   stage: build
-  image: renku/renku-python:latest
+  image: $CI_REGISTRY_IMAGE:$IMAGE_COMMIT
+  before_script:
+  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+  - eval $(ssh-agent -s)
+  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+  - mkdir -p ~/.ssh
+  - chmod 700 ~/.ssh
   script:
-    - git ls-files --no-empty-directory --recurse-submodules -z | xargs -0 renku log --format dot > graph.dot
-  artifacts:
-    paths:
-      - graph.dot
-  environment:
-    name: dot/$CI_COMMIT_REF_NAME
-    url: $CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_REF_NAME/raw/graph.dot?job=$CI_JOB_NAME
+  - ssh -o StrictHostKeyChecking=no -tt dataops@148.187.97.230 << EOF
+  - cd renku/datalakes/home
+  - git pull
+  - git submodule update --init -- $SUB_MODULE
+  - python3 watching.py $SUB_MODULE
+  - exit
+  - EOF
\ No newline at end of file

Dockerfile

-FROM renku/singleuser:latest
+FROM renku/singleuser:0.3.5-renku0.5.2
 
-# Uncomment and adapt if code is to be included in the image
-# COPY src /code/src
+LABEL authors="James Runnalls"
 
-# install the python dependencies
-COPY requirements.txt /tmp/requirements.txt
-USER 0
-RUN pip install -r /tmp/requirements.txt
+USER root
 
-# switch to the user that will be used in the notebook
-USER 1000
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends \
+    apt-utils \
+    bash-completion \
+    build-essential \
+    curl \
+    virtualenvwrapper \
+    wget \
+    zlib1g-dev \
+    zsh \
+    openssh-server \
+    openssh-client \
+    && apt-get clean
\ No newline at end of file