Skip to content

Commit

Permalink
Merge branch 'release/1.0.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Feb 18, 2023
2 parents 215ca5b + cd301a7 commit fe54dbf
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 37 deletions.
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.7 - 2023.02.17
### Changed
* Added `stop_grace_period: "1s"` to the services that have long-running processes in the `docker-compose.yaml`
* Add dummy empty values for Codespaces in the Makefile, to avoid warnings from Docker
* Updated to `"craftcms/cms": "^4.3.10"`

## 1.0.6 - 2023.02.15
### Changed
* Use the `GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN` env var
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.8",
"craftcms/cms": "^4.3.10",
"vlucas/phpdotenv": "^5.4.0"
},
"require-dev": {
Expand Down
62 changes: 31 additions & 31 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ CREATE TABLE `sessions` (
KEY `idx_yazneqmwxikhavqobhucihwgnflrdncmudzi` (`dateUpdated`),
KEY `idx_oeujcbvyujkxarpuqhrldhvybvgkdiubxgys` (`userId`),
CONSTRAINT `fk_tuhyhbgxqqomovzsxwiabcuitncpnjaxbcnf` FOREIGN KEY (`userId`) REFERENCES `users` (`id`) ON DELETE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb3;
) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb3;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand Down Expand Up @@ -1591,7 +1591,7 @@ CREATE TABLE `widgets` (
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2023-02-08 14:23:06
-- Dump completed on 2023-02-18 3:25:33
-- MariaDB dump 10.19 Distrib 10.6.12-MariaDB, for Linux (aarch64)
--
-- Host: mysql Database: project
Expand Down Expand Up @@ -1908,7 +1908,7 @@ commit;
LOCK TABLES `info` WRITE;
/*!40000 ALTER TABLE `info` DISABLE KEYS */;
set autocommit=0;
INSERT INTO `info` VALUES (1,'4.3.8.1','4.0.0.9',0,'xqqgervoelhw','3@tylawohvfc','2023-02-02 05:28:23','2023-02-08 14:21:59','876de66d-7fde-40c5-b8b8-c4713c00d927');
INSERT INTO `info` VALUES (1,'4.3.10','4.0.0.9',0,'xqqgervoelhw','3@tylawohvfc','2023-02-02 05:28:23','2023-02-18 03:25:01','876de66d-7fde-40c5-b8b8-c4713c00d927');
/*!40000 ALTER TABLE `info` ENABLE KEYS */;
UNLOCK TABLES;
commit;
Expand Down Expand Up @@ -2234,7 +2234,7 @@ commit;
LOCK TABLES `users` WRITE;
/*!40000 ALTER TABLE `users` DISABLE KEYS */;
set autocommit=0;
INSERT INTO `users` VALUES (1,NULL,1,0,0,0,1,'admin',NULL,NULL,NULL,'[email protected]','$2y$13$crqJ.kzM.kBs.WsWGUxT9uUdR4Imi./d9prVKVya/MkWu/Bd/8.Ga','2023-02-08 14:19:39',NULL,NULL,NULL,'2023-02-02 05:28:58',NULL,1,NULL,NULL,NULL,0,'2023-02-02 05:28:24','2023-02-02 05:28:24','2023-02-08 14:19:39');
INSERT INTO `users` VALUES (1,NULL,1,0,0,0,1,'admin',NULL,NULL,NULL,'[email protected]','$2y$13$crqJ.kzM.kBs.WsWGUxT9uUdR4Imi./d9prVKVya/MkWu/Bd/8.Ga','2023-02-18 03:25:08',NULL,NULL,NULL,'2023-02-02 05:28:58',NULL,1,NULL,NULL,NULL,0,'2023-02-02 05:28:24','2023-02-02 05:28:24','2023-02-18 03:25:08');
/*!40000 ALTER TABLE `users` ENABLE KEYS */;
UNLOCK TABLES;
commit;
Expand Down Expand Up @@ -2287,4 +2287,4 @@ commit;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2023-02-08 14:23:06
-- Dump completed on 2023-02-18 3:25:33
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ services:
expose:
- "9000"
init: true
stop_grace_period: "1s"
tty: true
volumes: &php-volumes
- cpresources:/var/www/project/web/cpresources:delegated
Expand Down Expand Up @@ -75,6 +76,7 @@ services:
environment:
*env
init: true
stop_grace_period: "1s"
tty: true
volumes:
*php-volumes
Expand Down

0 comments on commit fe54dbf

Please sign in to comment.