Sync with changes in jt-base

joomlatools · Jun 6, 2022 · e5b09eb · e5b09eb
1 parent ccb640e
commit e5b09eb
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 31 deletions.
diff --git a/.github/Dockerfile b/.github/Dockerfile
@@ -34,9 +34,6 @@ EXPOSE 3306 33060
 # Install sudo (required for Gitpod)
 RUN apt-get install -y --no-install-recommends sudo
 
-# Install Pages
-COPY --chown=$APP_USER:$APP_USER ./config/pages $APP_DATA/config/pages
-
 # Install MySQL
 COPY ./config/s6/mysql-init.d /etc/mysql-init.d/
 COPY ./config/mysql /etc/mysql/

diff --git a/config/composer.json b/config/composer.json
diff --git a/config/composer.stub b/config/composer.stub
diff --git a/config/composer/pages.json b/config/composer/pages.json
@@ -0,0 +1,10 @@
+{
+  "require": {
+    "phpmailer/phpmailer": "^6.5",
+    "michelf/php-markdown": "^1.9",
+    "voku/html-min": "^4.0",
+    "matthiasmullie/minify": "^1.3",
+    "joomlatools/framework": "dev-master as 3.5.x-dev",
+    "joomlatools/pages": "dev-master as 0.22.x-dev"
+  }
+}
diff --git a/config/composer/shell.json b/config/composer/shell.json
@@ -0,0 +1,6 @@
+{
+  "require": {
+    "foliolabs/folioshell": "dev-feature/10-refactor as 1.1.x-dev",
+    "joomlatools/console": "dev-master as 1.6.x-dev"
+  }
+}
diff --git a/config/preload_ignore.php → config/opcache/preload_ignore.php b/config/preload_ignore.php → config/opcache/preload_ignore.php
diff --git a/config/pages/koowa.php → config/vendor/koowa.php b/config/pages/koowa.php → config/vendor/koowa.php
diff --git a/config/pages/pages.php → config/vendor/pages.php b/config/pages/pages.php → config/vendor/pages.php