Merge pull request #2504 from vlauciani/master
fix TLS docker-dind problem from version 18.09+
This commit is contained in:
commit
081e65d192
@ -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:
|
||||||
@ -146,6 +146,7 @@ services:
|
|||||||
- no_proxy
|
- no_proxy
|
||||||
volumes:
|
volumes:
|
||||||
- ${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
|
||||||
- ./php-worker/supervisord.d:/etc/supervisord.d
|
- ./php-worker/supervisord.d:/etc/supervisord.d
|
||||||
extra_hosts:
|
extra_hosts:
|
||||||
- "dockerhost:${DOCKER_HOST_IP}"
|
- "dockerhost:${DOCKER_HOST_IP}"
|
||||||
@ -156,7 +157,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
|
||||||
@ -232,13 +236,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
|
||||||
@ -1270,11 +1278,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:
|
||||||
|
Loading…
Reference in New Issue
Block a user