Merge branch 'staging' into ingestor_test

.gitlab-ci.yml

@@ -32,7 +32,7 @@ build-tag:
     - docker build --cache-from "$IMAGE_6":latest -t "$IMAGE_6":dev -t "$IMAGE_6":$CI_COMMIT_TAG ingestor/
     - IMAGE_7="$CI_REGISTRY_IMAGE/pvs_sftp"
     - docker pull "$IMAGE_7":latest || true
-    - docker build --cache-from "$IMAGE_7":latest -t "$IMAGE_7":latest -t "$IMAGE_7":$CI_COMMIT_TAG sftp/
+    - docker build --cache-from "$IMAGE_7":latest -t "$IMAGE_7":dev -t "$IMAGE_7":$CI_COMMIT_TAG sftp/
     - cd ./testing && ./gitlab_test.sh
     - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
     - docker push "$IMAGE_1":$CI_COMMIT_TAG
@@ -76,7 +76,7 @@ build-master-staging:
     - docker build --cache-from "$IMAGE_6":"$TAG_USED" -t "$IMAGE_6":dev -t "$IMAGE_6":"$TAG_USED" ingestor/
     - IMAGE_7="$CI_REGISTRY_IMAGE/pvs_sftp"
     - docker pull "$IMAGE_7":"$TAG_USED" || true
-    - docker build --cache-from "$IMAGE_7":latest -t "$IMAGE_7":latest -t "$IMAGE_7":"$TAG_USED" sftp/
+    - docker build --cache-from "$IMAGE_7":latest -t "$IMAGE_7":dev -t "$IMAGE_7":"$TAG_USED" sftp/
     - cd ./testing && ./gitlab_test.sh
     - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
     - docker push "$IMAGE_1":"$TAG_USED"

docker-compose.dem.dev.yml

@@ -9,6 +9,8 @@ services:
       - type: bind
         source: ./data/
         target: /data/
+  sftp:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:dev
   ingestor:
     image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:dev
   fluentd:

docker-compose.dem.ops.yml

@@ -130,6 +130,7 @@ services:
       placement:
         constraints: [node.role == manager]
   sftp:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.0.0 # bumpversion
     deploy:
       placement:
         constraints: [node.role == manager]

docker-compose.emg.dev.yml

@@ -9,6 +9,8 @@ services:
       - type: bind
         source: ./data/
         target: /data/
+  sftp:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:dev
   ingestor:
     image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:dev
     environment:

docker-compose.emg.ops.yml

@@ -130,6 +130,7 @@ services:
       placement:
         constraints: [node.role == manager]
   sftp:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.0.0 # bumpversion
     deploy:
       placement:
         constraints: [node.role == manager]

docker-compose.vhr18.dev.yml

@@ -9,6 +9,8 @@ services:
       - type: bind
         source: ./data/
         target: /data/
+  sftp:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:dev
   ingestor:
     image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:dev
   fluentd:

docker-compose.vhr18.ops.yml

@@ -130,6 +130,7 @@ services:
       placement:
         constraints: [node.role == manager]
   sftp:
+    image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.0.0 # bumpversion
     deploy:
       placement:
         constraints: [node.role == manager]

sftp/entrypoint.sh

 #!/bin/bash
-echo " baloola"
+
 for user_home in /home/* ; do
 echo $user_home
   if [ -d "$user_home" ]; then