diff --git a/CHANGELOG.md b/CHANGELOG.md index 699d882..3775195 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # nystudio107/craft Change Log +## 2.4.15 - 2021.01.09 +### Changed +* Update to Axios `^0.21.1` +* Tabs -> Spaces in the Dockerfiles + ## 2.4.14 - 2021.01.04 ### Changed * Use slimmed down Alpine images for Docker diff --git a/buildchain/package.json b/buildchain/package.json index 2696d06..474c948 100644 --- a/buildchain/package.json +++ b/buildchain/package.json @@ -34,7 +34,7 @@ "url": "https://github.com/example-developer/example-project/issues" }, "dependencies": { - "axios": "^0.19.0", + "axios": "^0.21.1", "core-js": "^3.0.0", "lazysizes": "^5.2.2", "regenerator-runtime": "^0.13.2", diff --git a/composer.json b/composer.json index 5d253cb..50d1e83 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "craftcms/craft", "description": "nystudio107 Craft 3.4 CMS scaffolding project", - "version": "2.4.14", + "version": "2.4.15", "keywords": [ "craft", "cms", diff --git a/docker-config/php-dev-craft/Dockerfile b/docker-config/php-dev-craft/Dockerfile index 3c16a9f..9f1f64f 100755 --- a/docker-config/php-dev-craft/Dockerfile +++ b/docker-config/php-dev-craft/Dockerfile @@ -3,23 +3,23 @@ FROM nystudio107/php-dev-base:7.4-alpine # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) ENV PHPIZE_DEPS \ - autoconf \ - dpkg-dev \ - dpkg \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c \ - wget + autoconf \ + dpkg-dev \ + dpkg \ + file \ + g++ \ + gcc \ + libc-dev \ + make \ + pkgconf \ + re2c \ + wget # Install packages RUN set -eux; \ # Packages needed only for build - apk add --no-cache --virtual .build-deps \ - $PHPIZE_DEPS \ + apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ && \ # Packages to install apk add --no-cache \ diff --git a/docker-config/php-prod-craft/Dockerfile b/docker-config/php-prod-craft/Dockerfile index 8ccade2..bdec430 100755 --- a/docker-config/php-prod-craft/Dockerfile +++ b/docker-config/php-prod-craft/Dockerfile @@ -3,23 +3,23 @@ FROM nystudio107/php-prod-base:7.4-alpine # dependencies required for running "phpize" # these get automatically installed and removed by "docker-php-ext-*" (unless they're already installed) ENV PHPIZE_DEPS \ - autoconf \ - dpkg-dev \ - dpkg \ - file \ - g++ \ - gcc \ - libc-dev \ - make \ - pkgconf \ - re2c \ - wget + autoconf \ + dpkg-dev \ + dpkg \ + file \ + g++ \ + gcc \ + libc-dev \ + make \ + pkgconf \ + re2c \ + wget # Install packages RUN set -eux; \ # Packages needed only for build - apk add --no-cache --virtual .build-deps \ - $PHPIZE_DEPS \ + apk add --no-cache --virtual .build-deps \ + $PHPIZE_DEPS \ && \ # Packages to install apk add --no-cache \