From f5ce203b9edbe30f964c26484e840f69b2573987 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Mon, 9 Nov 2020 17:29:05 +0100
Subject: [PATCH] wait for registrar initialized in test
---
.gitlab-ci.yml | 6 +++---
testing/Dockerfile | 2 +-
testing/registrar_test.sh | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1fa3064..d0841394 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ build-tag:
image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage: build
services:
- - docker:19.03.12-dind
+ - docker:19.03.13-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
@@ -44,7 +44,7 @@ build-master-staging:
image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage: build
services:
- - docker:19.03.12-dind
+ - docker:19.03.13-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
@@ -84,7 +84,7 @@ build:
image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage: build
services:
- - docker:19.03.12-dind
+ - docker:19.03.13-dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
diff --git a/testing/Dockerfile b/testing/Dockerfile
index e423222b..c210be98 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -27,7 +27,7 @@
# this image is built manually and pushed to registry.gitlab.eox.at/esa/prism/vs/docker-base-testing
-FROM docker:latest
+FROM docker:19.03.13-dind
RUN apk update && apk add bash postgresql-dev gcc g++ python3 python3-dev musl-dev py-pip libffi-dev openssl-dev make gdal==3.1.4-r0 gdal-dev==3.1.4-r0
diff --git a/testing/registrar_test.sh b/testing/registrar_test.sh
index 1d3e0aae..cbf978fb 100755
--- a/testing/registrar_test.sh
+++ b/testing/registrar_test.sh
@@ -8,7 +8,7 @@ IFS=","
while read product; do
docker exec -e OS_PASSWORD=$OS_PASSWORD -i $(docker ps -qf "name=emg-pvs_registrar") \
- python3 /registrar.py \
+ /wait-initialized.sh && python3 /registrar.py \
--objects-prefix $product \
--service-url $SERVICE_URL \
--reporting-dir "/mnt/reports" \
--
GitLab