Remove DinD Service from container build template (#3676)

* Remove DinD Service from container build template

DinD has changed how it works on GItLab due to recent docker changes such that the service no long needs to be called so long as the runner is being run on a `docker-X` tagged machine.

* refactor for docker service on normal node
This commit is contained in:
John Northrup
2020-12-03 23:43:21 -06:00
committed by GitHub
parent 76a6956138
commit f239050054

View File

@@ -44,14 +44,16 @@ stages:
- . ./Builds/containers/gitlab-ci/docker_alpine_setup.sh - . ./Builds/containers/gitlab-ci/docker_alpine_setup.sh
variables: variables:
docker_driver: overlay2 docker_driver: overlay2
DOCKER_TLS_CERTDIR: ""
image: image:
name: docker:latest name: artifactory.ops.ripple.com/docker:latest
services: services:
# workaround for TLS issues - consider going back # workaround for TLS issues - consider going back
# back to unversioned `dind` when issues are resolved # back to unversioned `dind` when issues are resolved
- docker:18-dind - name: artifactory.ops.ripple.com/docker:stable-dind
alias: docker
tags: tags:
- docker-4xlarge - 4xlarge
.only_primary_template: &only_primary .only_primary_template: &only_primary
only: only:
@@ -281,14 +283,16 @@ tag_bld_images:
stage: tag_images stage: tag_images
variables: variables:
docker_driver: overlay2 docker_driver: overlay2
DOCKER_TLS_CERTDIR: ""
image: image:
name: docker:19.03.8 name: artifactory.ops.ripple.com/docker:latest
services: services:
# workaround for TLS issues - consider going back # workaround for TLS issues - consider going back
# back to unversioned `dind` when issues are resolved # back to unversioned `dind` when issues are resolved
- docker:18-dind - name: artifactory.ops.ripple.com/docker:stable-dind
alias: docker
tags: tags:
- docker-large - large
dependencies: dependencies:
- rpm_sign - rpm_sign
- dpkg_sign - dpkg_sign