From 99bea2fff83db4fa8bd316a2f6f0c836ef9feb5c Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Tue, 24 Nov 2020 10:51:26 +0100
Subject: [PATCH] use same tags for sftp service for homogeneity
---
.gitlab-ci.yml | 4 ++--
docker-compose.dem.dev.yml | 2 ++
docker-compose.dem.ops.yml | 1 +
docker-compose.emg.dev.yml | 2 ++
docker-compose.emg.ops.yml | 1 +
docker-compose.vhr18.dev.yml | 2 ++
docker-compose.vhr18.ops.yml | 1 +
7 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7bae9f03..750aec00 100644
--- a/.gitlab-ci.yml
+++ b/.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"
diff --git a/docker-compose.dem.dev.yml b/docker-compose.dem.dev.yml
index d39ce234..99b74500 100644
--- a/docker-compose.dem.dev.yml
+++ b/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:
diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml
index 61ee1052..03b9cb77 100644
--- a/docker-compose.dem.ops.yml
+++ b/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]
diff --git a/docker-compose.emg.dev.yml b/docker-compose.emg.dev.yml
index 672a23d5..56030c90 100644
--- a/docker-compose.emg.dev.yml
+++ b/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
fluentd:
diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml
index 058b7697..2e7e0f98 100644
--- a/docker-compose.emg.ops.yml
+++ b/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]
diff --git a/docker-compose.vhr18.dev.yml b/docker-compose.vhr18.dev.yml
index e37d1238..dc2f32bc 100644
--- a/docker-compose.vhr18.dev.yml
+++ b/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:
diff --git a/docker-compose.vhr18.ops.yml b/docker-compose.vhr18.ops.yml
index b4bc35d2..c0a339e6 100644
--- a/docker-compose.vhr18.ops.yml
+++ b/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]
--
GitLab