Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-advanced-user-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-advanced-user-tools
Commits
6ff02197
Commit
6ff02197
authored
5 years ago
by
Henrik tom Wörden
Browse files
Options
Downloads
Patches
Plain Diff
remove notls tag
parent
f84d2907
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.docker/run.sh
+1
-0
1 addition, 0 deletions
.docker/run.sh
.gitlab-ci.yml
+7
-11
7 additions, 11 deletions
.gitlab-ci.yml
with
8 additions
and
11 deletions
.docker/run.sh
+
1
−
0
View file @
6ff02197
...
...
@@ -2,4 +2,5 @@
docker-compose
-f
tester.yml run tester
rv
=
$?
echo
"result value is "
$rv
echo
$rv
>
result
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
7
−
11
View file @
6ff02197
...
...
@@ -21,13 +21,12 @@
variables
:
CI_REGISTRY_IMAGE
:
$CI_REGISTRY/caosdb-advanced-testenv
# With dind the docker deamon is available on the network
DOCKER_HOST
:
tcp://docker:2375/
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
DOCKER_DRIVER
:
overlay2
services
:
-
docker:1
8
.0
9.7
-dind
-
docker:1
9
.0
3.0
-dind
stages
:
-
setup
...
...
@@ -36,11 +35,9 @@ stages:
-
test
test
:
tags
:
[
notls
]
tags
:
[
docker
]
stage
:
test
image
:
name
:
docker/compose:1.24.1
entrypoint
:
[
"
/bin/sh"
,
"
-c"
]
image
:
registry.indiscale.com/caosdb-glaz_awi-testenv
script
:
-
if [[ "$CAOSDB_TAG" == "" ]]; then
CAOSDB_TAG=dev-latest;
...
...
@@ -56,7 +53,7 @@ test:
-
docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
-
docker logs docker_sqldb_1 &> ../mariadb_log.txt
-
docker-compose -f .docker/docker-compose.yml down
-
rc=`cat result`
-
rc=`cat
.docker/
result`
-
exit $rc
dependencies
:
[
cert
]
artifacts
:
...
...
@@ -70,19 +67,18 @@ build-testenv:
tags
:
[
notls
]
image
:
docker:18.09
stage
:
setup
only
:
-
schedules
script
:
-
docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# use here general latest or specific branch latest...
-
docker pull $CI_REGISTRY_IMAGE:latest ||
true
-
docker build
--pull
--file .docker/Dockerfile
--cache-from $CI_REGISTRY_IMAGE:latest
-t $CI_REGISTRY_IMAGE:latest .
-
docker push $CI_REGISTRY_IMAGE:latest
cert
:
tags
:
[
notls
]
tags
:
[
docker
]
stage
:
cert
image
:
$CI_REGISTRY_IMAGE:latest
artifacts
:
...
...
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