EOX GitLab Instance
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESA
PRISM
VS
Commits
f5ce203b
Commit
f5ce203b
authored
4 years ago
by
Lubomir Dolezal
Browse files
Options
Downloads
Patches
Plain Diff
wait for registrar initialized in test
parent
aaed066c
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!36
Staging to master to prepare 1.0.0 release
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+3
-3
3 additions, 3 deletions
.gitlab-ci.yml
testing/Dockerfile
+1
-1
1 addition, 1 deletion
testing/Dockerfile
testing/registrar_test.sh
+1
-1
1 addition, 1 deletion
testing/registrar_test.sh
with
5 additions
and
5 deletions
.gitlab-ci.yml
+
3
−
3
View file @
f5ce203b
...
...
@@ -8,7 +8,7 @@ build-tag:
image
:
registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage
:
build
services
:
-
docker:19.03.1
2
-dind
-
docker:19.03.1
3
-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.1
2
-dind
-
docker:19.03.1
3
-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.1
2
-dind
-
docker:19.03.1
3
-dind
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script
:
...
...
This diff is collapsed.
Click to expand it.
testing/Dockerfile
+
1
−
1
View file @
f5ce203b
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
testing/registrar_test.sh
+
1
−
1
View file @
f5ce203b
...
...
@@ -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"
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment