Skip to content

Commit

Permalink
Merge branch 'release/1.0.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Mar 24, 2023
2 parents 40cb031 + c7e1f5f commit 49dc752
Show file tree
Hide file tree
Showing 8 changed files with 340 additions and 343 deletions.
2 changes: 1 addition & 1 deletion .docker-config/mysql/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM mysql/mysql-server:latest
FROM jbergstroem/mariadb-alpine:latest
10 changes: 0 additions & 10 deletions .docker-config/php/composer_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,4 @@ cd /var/www/project
if [ ! -f "composer.lock" ] || [ ! -d "vendor" ] || [ ! -f "vendor/autoload.php" ]; then
chown -R www-data:www-data /var/www/project
su-exec www-data composer install --verbose --no-progress --no-scripts --no-interaction
# Wait until the MySQL db container responds
echo "### Waiting for MySQL database"
until eval "mysql -h mysql -u $CRAFT_DB_USER -p$CRAFT_DB_PASSWORD $CRAFT_DB_DATABASE -e 'select 1' > /dev/null 2>&1"
do
sleep 1
done
# Run any pending migrations/project config changes
su-exec www-data php craft up --interactive=0
fi
# Banner message
source '/var/www/banner_message.sh'
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# nystudio107/spin-up-craft Change Log

## 1.0.12 - UNRELEASED
### Changed
* Updated to `craftcms/cms` `^4.4.5`
* Switch to `jbergstroem/mariadb-alpine` for the db container, for a much smaller image size, and a much faster startup time
* Run `php craft up` and display the banner message only from the queue container

## 1.0.11 - 2023.03.02
### Fixed
* Use a unique CSRF token name, to avoid issues with CSRF validation with multiple instances of Craft running on the same host (localhost)
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ You can also consider [adding an **Open in Codespaces**](https://docs.github.com
4. Wait until you see output like this, and then access the site via the credentials that are output on the console:

```
php_1 | ### Your Craft site is ready!
php_1 | Frontend URL: https://khalwat-opulent-xylophone-q59g6p5vqj3rvr-8050.preview.app.github.dev/
php_1 | CP URL: https://khalwat-opulent-xylophone-q59g6p5vqj3rvr-8050.preview.app.github.dev/admin
php_1 | CP User: admin
php_1 | CP Password: project
queue_1 | ### Your Craft site is ready!
queue_1 | Frontend URL: https://khalwat-opulent-xylophone-q59g6p5vqj3rvr-8050.preview.app.github.dev/
queue_1 | CP URL: https://khalwat-opulent-xylophone-q59g6p5vqj3rvr-8050.preview.app.github.dev/admin
queue_1 | CP User: admin
queue_1 | CP Password: project
```

This lets anyone use the project without having to do _any_ local setup.
Expand All @@ -60,11 +60,11 @@ You are limited to 15 active Codespaces on the free plan, but you can go in and
5. Wait until you see output like this, and then access the site via the credentials that are output on the console:

```
spin-up-craft-php-1 | ### Your Craft site is ready!
spin-up-craft-php-1 | Frontend URL: http://localhost:8050/
spin-up-craft-php-1 | CP URL: http://localhost:8050/admin
spin-up-craft-php-1 | CP User: admin
spin-up-craft-php-1 | CP Password: project
spin-up-craft-queue-1 | ### Your Craft site is ready!
spin-up-craft-queue-1 | Frontend URL: http://localhost:8050/
spin-up-craft-queue-1 | CP URL: http://localhost:8050/admin
spin-up-craft-queue-1 | CP User: admin
spin-up-craft-queue-1 | CP Password: project
```

Hit `Control-C` to terminate the project and spin down the containers
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"craftcms/cms": "^4.3.10",
"craftcms/cms": "^4.4.5",
"vlucas/phpdotenv": "^5.4.0"
},
"require-dev": {
Expand Down
7 changes: 4 additions & 3 deletions config/project/project.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dateModified: 1675658606
dateModified: 1679617195
email:
fromEmail: [email protected]
fromName: 'Craft Coding Challenge'
Expand All @@ -9,18 +9,19 @@ graphql:
expiryDate: null
meta:
__names__:
0b13c242-c4bf-4365-b5d1-fd1fe51676d8: 'Public Schema'
0d89c679-f6f5-42ae-8341-4bea917c6af7: $CRAFT_SITE_NAME # $CRAFT_SITE_NAME
0779f354-f5d2-4f82-9a36-28a252f70ce4: 'Public Schema' # Public Schema
31006d4c-2f40-498c-9a4c-69cff4fd4279: Common # Common
b55012be-3f7f-4150-b59c-5a6623c00743: 'Public Schema'
b55012be-3f7f-4150-b59c-5a6623c00743: 'Public Schema' # Public Schema
c7c2807b-84cc-4e1f-9279-af044bc0b472: 'Public Schema' # Public Schema
f255ef6d-0c55-4bdc-9ced-f610bbb3bed6: $CRAFT_SITE_NAME # $CRAFT_SITE_NAME
system:
edition: pro
live: true
name: $CRAFT_SITE_NAME
retryDuration: null
schemaVersion: 4.0.0.9
schemaVersion: 4.4.0.4
timeZone: America/Los_Angeles
users:
allowPublicRegistration: false
Expand Down
Loading

0 comments on commit 49dc752

Please sign in to comment.