Commit 2b3879da authored by Matija Obreza's avatar Matija Obreza
Browse files

WUP

parent e1229a7f
......@@ -2,18 +2,6 @@ include:
# https://docs.gitlab.com/ce/ci/yaml/README.html#workflowrules-templates
- template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
# DinD service is required for Testcontainers
services:
- name: docker:stable-dind
alias: docker
# explicitly disable tls to avoid docker startup interruption
command: ["--tls=false"]
variables:
# Instruct Docker not to start over TLS.
DOCKER_TLS_CERTDIR: ""
# Improve performance with overlayfs.
DOCKER_DRIVER: overlay2
variables:
VERSION: "3.0.0"
......@@ -25,7 +13,7 @@ variables:
# `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
MAVEN_CLI_OPTS: "--batch-mode --errors --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
# # Instruct Testcontainers to use the daemon of DinD.
DOCKER_HOST: tcp://docker:2375
DOCKER_HOST: tcp://docker-dind:2375
# Disable Ryuk https://www.testcontainers.org/features/configuration/#disabling-ryuk
TESTCONTAINERS_RYUK_DISABLED: "true"
......@@ -43,12 +31,25 @@ stages:
package amphibian:
stage: package
image: maven:3-openjdk-11
# DinD service is required for Testcontainers
services:
- name: docker:stable-dind
alias: docker-dind
# explicitly disable tls to avoid docker startup interruption
command: ["--tls=false"]
variables:
# Instruct Docker not to start over TLS.
DOCKER_TLS_CERTDIR: ""
# Improve performance with overlayfs.
DOCKER_DRIVER: overlay2
variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_HOST: tcp://docker-dind:2375
script:
- pushd amphibian-server
- echo "DOCKER_HOST is set to ${DOCKER_HOST}"
- mvn package -B -U -Ddocker.host=tcp://docker:2375
- mvn package -B -U -Ddocker.host=tcp://docker-dind:2375
- popd
- pushd amphibian-client
- mvn package -B -U
......@@ -63,7 +64,7 @@ package amphibian:
.docker_dind_setup: &docker_dind_setup
image: docker:latest
before_script:
- DOCKER_HOST="tcp://docker:2375"
- DOCKER_HOST="tcp://docker-dind:2375"
- DOCKER_CMD="docker --tlsverify=false"
.docker_setup: &docker_setup
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment