ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update docker-in-docker (dind) - not working with 18.09+ version

This commit is contained in:
Valentino Lauciani 2020-02-13 23:24:07 +01:00 committed by GitHub
parent 4dd4074d3b
commit 8e6a2a4f3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker-compose.yml
View File

@ -49,7 +49,7 @@ volumes:
driver: ${VOLUMES_DRIVER} driver: ${VOLUMES_DRIVER}
graylog: graylog:
driver: ${VOLUMES_DRIVER} driver: ${VOLUMES_DRIVER}
dind: docker-in-docker:
driver: ${VOLUMES_DRIVER} driver: ${VOLUMES_DRIVER}
services: services:
@ -154,7 +154,10 @@ services:
tty: true tty: true
environment: environment:
- PHP_IDE_CONFIG=${PHP_IDE_CONFIG} - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
- DOCKER_HOST=tcp://docker-in-docker:2375 - DOCKER_HOST=tcp://docker-in-docker:2376
- DOCKER_TLS_VERIFY=1
- DOCKER_TLS_CERTDIR=/certs
- DOCKER_CERT_PATH=/certs/client
networks: networks:
- frontend - frontend
- backend - backend
@ -230,13 +233,17 @@ services:
volumes: volumes:
- ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG} - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
- docker-in-docker:/certs/client
expose: expose:
- "9000" - "9000"
extra_hosts: extra_hosts:
- "dockerhost:${DOCKER_HOST_IP}" - "dockerhost:${DOCKER_HOST_IP}"
environment: environment:
- PHP_IDE_CONFIG=${PHP_IDE_CONFIG} - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
- DOCKER_HOST=tcp://docker-in-docker:2375 - DOCKER_HOST=tcp://docker-in-docker:2376
- DOCKER_TLS_VERIFY=1
- DOCKER_TLS_CERTDIR=/certs
- DOCKER_CERT_PATH=/certs/client
- FAKETIME=${PHP_FPM_FAKETIME} - FAKETIME=${PHP_FPM_FAKETIME}
depends_on: depends_on:
- workspace - workspace
@ -1268,11 +1275,13 @@ services:
### Docker-in-Docker ################################################ ### Docker-in-Docker ################################################
docker-in-docker: docker-in-docker:
image: docker:dind image: docker:19.03-dind
environment:
DOCKER_TLS_SAN: DNS:docker-in-docker
privileged: true privileged: true
volumes: volumes:
- ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER} - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}
- ${DATA_PATH_HOST}/dind:/var/lib/docker - docker-in-docker:/certs/client
expose: expose:
- 2375 - 2375
networks: networks: