Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-webui
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
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-webui
Commits
9683c178
Commit
9683c178
authored
5 years ago
by
Henrik tom Woerden
Browse files
Options
Downloads
Patches
Plain Diff
fix gitlab ci by setting docker versions
parent
2c65efb8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+2
-8
2 additions, 8 deletions
.gitlab-ci.yml
with
2 additions
and
8 deletions
.gitlab-ci.yml
+
2
−
8
View file @
9683c178
#
#
# ** header v3.0
# This file is a part of the CaosDB Project.
# This file is a part of the CaosDB Project.
#
#
# Copyright (C) 2018 Research Group Biomedical Physics,
# Copyright (C) 2018 Research Group Biomedical Physics,
...
@@ -18,20 +17,15 @@
...
@@ -18,20 +17,15 @@
#
#
# You should have received a copy of the GNU Affero General Public License
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# ** end header
#
variables
:
variables
:
CI_REGISTRY_IMAGE
:
$CI_REGISTRY/caosdb-webui-testenv
CI_REGISTRY_IMAGE
:
$CI_REGISTRY/caosdb-webui-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
# When using dind, it's wise to use the overlayfs driver for
# improved performance.
# improved performance.
DOCKER_DRIVER
:
overlay2
DOCKER_DRIVER
:
overlay2
services
:
services
:
-
docker:dind
-
docker:
19.03-
dind
image
:
$CI_REGISTRY_IMAGE:latest
image
:
$CI_REGISTRY_IMAGE:latest
...
@@ -78,7 +72,7 @@ trigger_build:
...
@@ -78,7 +72,7 @@ trigger_build:
# Build a docker image in which tests for this repository can run
# Build a docker image in which tests for this repository can run
build-testenv
:
build-testenv
:
tags
:
[
docker
]
tags
:
[
docker
]
image
:
docker:
latest
image
:
docker:
19.03
stage
:
setup
stage
:
setup
script
:
script
:
-
cd test/docker
-
cd test/docker
...
...
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