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

Merge branch 'master' into patch-35

Browse Source
This commit is contained in:
erikn69
2025-12-18 09:05:14 -05:00
committed by GitHub
parent af8db178e8 565e6ba06c
commit 343767c1ac
22 changed files with 18944 additions and 10892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose.yml
View File

@@ -111,6 +111,7 @@ services:
- INSTALL_OCI8=${WORKSPACE_INSTALL_OCI8}
- INSTALL_V8JS=${WORKSPACE_INSTALL_V8JS}
- COMPOSER_GLOBAL_INSTALL=${WORKSPACE_COMPOSER_GLOBAL_INSTALL}
- WORKSPACE_ALLOW_RELEASE_INFO_CHANGE=${WORKSPACE_ALLOW_RELEASE_INFO_CHANGE}
- COMPOSER_VERSION=${WORKSPACE_COMPOSER_VERSION}
- COMPOSER_AUTH_JSON=${WORKSPACE_COMPOSER_AUTH_JSON}
- COMPOSER_REPO_PACKAGIST=${WORKSPACE_COMPOSER_REPO_PACKAGIST}
@@ -1666,7 +1667,7 @@ services:
### Docker-in-Docker ################################################
docker-in-docker:
restart: always
image: docker:20.10-dind
image: docker:29-dind
environment:
DOCKER_TLS_SAN: DNS:docker-in-docker
privileged: true