WordPress.org
Get WordPress

Make WordPress Core

Changeset 51673 for trunk


Ignore:
Timestamp:
08/26/2021 06:40:15 PM (3 years ago)
Author:
desrosj
Message:

Build/Test Tools: Use list format when defining environment variables in Docker compose file.

This is the correct formatting detailed in the Docker compose documentation examples and helps to avoid ambiguities in the yaml parser when values that may cause warnings.

Props pbrearne, ocean90, johnbillion, desrosj.
Fixes #53820.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/docker-compose.yml

    r50697 r51673  
    3838
    3939    environment:
    40       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
    41       LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
    42       PHP_FPM_UID: ${PHP_FPM_UID-1000}
    43       PHP_FPM_GID: ${PHP_FPM_GID-1000}
     40      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
     41      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     42      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     43      - PHP_FPM_GID=${PHP_FPM_GID-1000}
    4444
    4545    volumes:
    … …  
    8282
    8383    environment:
    84       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
    85       LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
    86       PHP_FPM_UID: ${PHP_FPM_UID-1000}
    87       PHP_FPM_GID: ${PHP_FPM_GID-1000}
     84      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
     85      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     86      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     87      - PHP_FPM_GID=${PHP_FPM_GID-1000}
    8888
    8989    volumes:
    … …  
    103103
    104104    environment:
    105       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
    106       LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
    107       LOCAL_DIR: ${LOCAL_DIR-src}
    108       WP_MULTISITE: ${WP_MULTISITE-false}
    109       PHP_FPM_UID: ${PHP_FPM_UID-1000}
    110       PHP_FPM_GID: ${PHP_FPM_GID-1000}
    111       GITHUB_REF: ${GITHUB_REF-false}
    112       GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME-false}
     105      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
     106      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     107      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     108      - PHP_FPM_GID=${PHP_FPM_GID-1000}
     109      - LOCAL_DIR=${LOCAL_DIR-src}
     110      - WP_MULTISITE=${WP_MULTISITE-false}
     111      - GITHUB_REF=${GITHUB_REF-false}
     112      - GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}
    113113
    114114    volumes:
Note: See TracChangeset for help on using the changeset viewer.