Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Feb 6, 2023
2 parents 46e6814 + fcc7b41 commit ee2749d
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 423 deletions.
22 changes: 22 additions & 0 deletions .docker-config/spin-up-craft-base/php-8.0-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
FROM nystudio107/php-prod-base:8.0-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

# Install packages
RUN set -eux; \
# Packages needed only for build
apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS \
&& \
# Packages to install
apk add --no-cache \
su-exec \
Expand All @@ -17,5 +36,8 @@ RUN set -eux; \
# Install Composer
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& \
# Remove the build deps
apk del .build-deps \
&& \
# Clean out directories that don't need to be part of the image
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# nystudio107/spin-up-craft Change Log

## 1.0.3 - 2023.02.05
### Added
* Added `nystudio107/craft-autocomplete` to allow for Craft API autocomplete in PhpStorm

### Changed
* Updated to `"craftcms/cms": "^4.3.7.1"`
* Removed `craftcms/generator` to lighten the dependency graph
* Removed `yiisoft/yii2-shell` to lighten the dependency graph
* Use `PHPIZE_DEPS` in `spin-up-craft-base` Docker image

## 1.0.2 - 2023.02.04
### Added
* Build docker images via Github Actions CI
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{
"require": {
"craftcms/cms": "^4.3.5",
"craftcms/cms": "^4.3.7.1",
"vlucas/phpdotenv": "^5.4.0"
},
"require-dev": {
"craftcms/generator": "^1.0.0",
"yiisoft/yii2-shell": "^2.0.3"
"nystudio107/craft-autocomplete": "^1.11.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit ee2749d

Please sign in to comment.