EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit f5ce203b authored by Lubomir Dolezal's avatar Lubomir Dolezal
Browse files

wait for registrar initialized in test

parent aaed066c
Branches
Tags
1 merge request!36Staging to master to prepare 1.0.0 release
...@@ -8,7 +8,7 @@ build-tag: ...@@ -8,7 +8,7 @@ build-tag:
image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage: build stage: build
services: services:
- docker:19.03.12-dind - docker:19.03.13-dind
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
...@@ -44,7 +44,7 @@ build-master-staging: ...@@ -44,7 +44,7 @@ build-master-staging:
image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage: build stage: build
services: services:
- docker:19.03.12-dind - docker:19.03.13-dind
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
...@@ -84,7 +84,7 @@ build: ...@@ -84,7 +84,7 @@ build:
image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage: build stage: build
services: services:
- docker:19.03.12-dind - docker:19.03.13-dind
before_script: before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script: script:
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
# this image is built manually and pushed to registry.gitlab.eox.at/esa/prism/vs/docker-base-testing # 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 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
......
...@@ -8,7 +8,7 @@ IFS="," ...@@ -8,7 +8,7 @@ IFS=","
while read product; do while read product; do
docker exec -e OS_PASSWORD=$OS_PASSWORD -i $(docker ps -qf "name=emg-pvs_registrar") \ 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 \ --objects-prefix $product \
--service-url $SERVICE_URL \ --service-url $SERVICE_URL \
--reporting-dir "/mnt/reports" \ --reporting-dir "/mnt/reports" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment