Changeset 50243

Timestamp:

02/08/2021 08:50:12 PM (5 years ago)

Author:

desrosj

Message:

Build/Test Tools: Backport the local Docker environment to the 4.5 branch.

This commit introduces the Docker-based local WordPress development environment to the 4.5 branch and converts the Travis test jobs to utilize this environment for easier and more consistent testing.

Merges [44176,45445,45745,45762,45783-45784,45800,45819,45885,46320,46999,47225,47912,48121,49267,49335,49358,49360,49362] to the 4.5 branch.
See #48301, #47767.

Location:

branches/4.5

Files:

• . (modified) (1 prop)
• .env (added)
• docker-compose.yml (added)
• package-lock.json (modified) (8 diffs)
• package.json (modified) (2 diffs)
• tools/local-env (added)
• tools/local-env/default.template (added)
• tools/local-env/mysql-init.sql (added)
• tools/local-env/php-config.ini (added)
• tools/local-env/phpunit-config.ini (added)
• tools/local-env/scripts (added)
• tools/local-env/scripts/docker.js (added)
• tools/local-env/scripts/install.js (added)
• tools/local-env/scripts/start.js (added)

branches/4.5/package-lock.json

@@ -14 +14 @@
                         }
                 },
+                "@hapi/hoek": {
+                        "version": "9.1.1",
+                        "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.1.1.tgz",
+                        "integrity": "sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==",
+                        "dev": true
+                },
+                "@hapi/topo": {
+                        "version": "5.0.0",
+                        "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz",
+                        "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==",
+                        "dev": true,
+                        "requires": {
+                                "@hapi/hoek": "^9.0.0"
+                        }
+                },
                 "@mrmlnc/readdir-enhanced": {
                         "version": "2.2.1",
@@ -28 +43 @@
                         "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
                         "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
+                        "dev": true
+                },
+                "@sideway/address": {
+                        "version": "4.1.1",
+                        "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.1.tgz",
+                        "integrity": "sha512-+I5aaQr3m0OAmMr7RQ3fR9zx55sejEYR2BFJaxL+zT3VM2611X0SHvPWIbAUBZVTn/YzYKbV8gJ2oT/QELknfQ==",
+                        "dev": true,
+                        "requires": {
+                                "@hapi/hoek": "^9.0.0"
+                        }
+                },
+                "@sideway/formula": {
+                        "version": "3.0.0",
+                        "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
+                        "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==",
+                        "dev": true
+                },
+                "@sideway/pinpoint": {
+                        "version": "2.0.0",
+                        "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+                        "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
                         "dev": true
                 },
@@ -440 +476 @@
                         "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
                         "dev": true
+                },
+                "axios": {
+                        "version": "0.21.1",
+                        "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+                        "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
+                        "dev": true,
+                        "requires": {
+                                "follow-redirects": "^1.10.0"
+                        }
                 },
                 "balanced-match": {
@@ -2203 +2248 @@
                         }
                 },
+                "dotenv": {
+                        "version": "8.2.0",
+                        "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+                        "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+                        "dev": true
+                },
+                "dotenv-expand": {
+                        "version": "5.1.0",
+                        "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+                        "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+                        "dev": true
+                },
                 "download": {
                         "version": "6.2.5",
@@ -2895 +2952 @@
                         "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
                         "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+                        "dev": true
+                },
+                "follow-redirects": {
+                        "version": "1.13.2",
+                        "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
+                        "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
                         "dev": true
                 },
@@ -4689 +4752 @@
                                 "has-to-string-tag-x": "^1.2.0",
                                 "is-object": "^1.0.1"
+                        }
+                },
+                "joi": {
+                        "version": "17.4.0",
+                        "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz",
+                        "integrity": "sha512-F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg==",
+                        "dev": true,
+                        "requires": {
+                                "@hapi/hoek": "^9.0.0",
+                                "@hapi/topo": "^5.0.0",
+                                "@sideway/address": "^4.1.0",
+                                "@sideway/formula": "^3.0.0",
+                                "@sideway/pinpoint": "^2.0.0"
                         }
                 },
@@ -7508 +7584 @@
                         }
                 },
+                "tslib": {
+                        "version": "1.14.1",
+                        "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+                        "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+                        "dev": true
+                },
                 "tty-browserify": {
                         "version": "0.0.1",
@@ -7822 +7904 @@
                         "dev": true
                 },
+                "wait-on": {
+                        "version": "5.2.1",
+                        "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.2.1.tgz",
+                        "integrity": "sha512-H2F986kNWMU9hKlI9l/ppO6tN8ZSJd35yBljMLa1/vjzWP++Qh6aXyt77/u7ySJFZQqBtQxnvm/xgG48AObXcw==",
+                        "dev": true,
+                        "requires": {
+                                "axios": "^0.21.1",
+                                "joi": "^17.3.0",
+                                "lodash": "^4.17.20",
+                                "minimist": "^1.2.5",
+                                "rxjs": "^6.6.3"
+                        },
+                        "dependencies": {
+                                "rxjs": {
+                                        "version": "6.6.3",
+                                        "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
+                                        "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
+                                        "dev": true,
+                                        "requires": {
+                                                "tslib": "^1.9.0"
+                                        }
+                                }
+                        }
+                },
                 "watchify": {
                         "version": "3.11.1",

branches/4.5/package.json

@@ -24 +24 @@
         "devDependencies": {
                 "autoprefixer": "^9.8.6",
+                "dotenv": "^8.2.0",
+                "dotenv-expand": "^5.1.0",
                 "grunt": "~1.3.0",
                 "grunt-browserify": "~5.3.0",
@@ -44 +46 @@
                 "grunt-sass": "~3.1.0",
                 "matchdep": "~2.0.0",
-                "sass": "^1.32.6"
+                "sass": "^1.32.6",
+                "wait-on": "5.2.1"
+        },
+        "scripts": {
+                "build": "grunt build",
+                "test": "grunt test",
+                "watch": "grunt watch",
+                "grunt": "grunt",
+                "env:start": "node ./tools/local-env/scripts/start.js",
+                "env:stop": "node ./tools/local-env/scripts/docker.js down",
+                "env:restart": "npm run env:stop && npm run env:start",
+                "env:clean": "node ./tools/local-env/scripts/docker.js down -v --remove-orphans",
+                "env:reset": "node ./tools/local-env/scripts/docker.js down --rmi all -v --remove-orphans",
+                "env:install": "node ./tools/local-env/scripts/install.js",
+                "env:cli": "node ./tools/local-env/scripts/docker.js run cli",
+                "env:logs": "node ./tools/local-env/scripts/docker.js logs",
+                "env:pull": "node ./tools/local-env/scripts/docker.js pull",
+                "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit"
         }
 }