Changes to Readme / Dockerfile

README.md

@@ -1,7 +1,8 @@
 # contao-docker-test
 
 #Installation:
-- Go to ".docker/contao" folder and create docker containers: `docker-compose up -d`
+- Start docker app (e.g. Docker Desktop)
+- Go to root folder in terminal and create docker containers: `docker-compose up -d`
 - Create a database for contao in database container:
   - One way to do so is to open up the "Database"-Tab of PhpStorm
     - Click on "+" -> Data Source -> MariaDB
@@ -14,8 +15,9 @@
       - Enter the following line into the console and press the "play"-button to execute the query:
       - `CREATE DATABASE contao CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;`
       - The database name is free to chose but in this example the database name 'contao' is being used
-  - Another way is to connect to phpmyadmin via [localhost:8080](http://localhost/8080) 
-    as it's configured in docker-compose.yml
+  - Another way is to connect to phpmyadmin via [localhost:8080](http://localhost:8080). The host name is "database"
+    as it's configured in docker-compose.yml (service: database).
+- Open [contao manager](http://localhost/contao-manager.phar.php) in browser and create an admin user for the manager.
 - Open [contao install](http://localhost/contao/install) in browser after database creation in order to install contao
   - Step through the installation process until you get to enter the database credentials
   - NOTE: the 'host' isn't 'localhost' here, use the name of the database service 'database' as it's configured in
@@ -40,7 +42,8 @@
        as your CLI Interpreter to make sure that PHPStorm helps you with your very PHP version :)
     9. To test if xdebug is running properly, just set a breakpoint in "app/contao/public/index.php" and execute
        some contao "action" in your browser e.g. [contao install](http://localhost/contao/install).
-       Xdebug should stop at your breakpoint :) 
+       Xdebug should stop at your breakpoint. Make sure PhpStorm is listening (Phone icon is green) and the breakpoint 
+       is set properly. :) 
 
 # Some important information
 - The database content is stored in a container which is bind-mounted to the 'db'-folder of the project

app/contao/.gitignore

@@ -9,14 +9,14 @@
 
 # Generated folders
 /assets/
-/files/
+#/files/
 /public/*
 !/public/contao-manager.phar.php
 /system/*
 !/system/config/
 /system/config/localconfig.php
 /system/config/tcpdf.php
-/templates/
+#/templates/
 /var/
 /web/
 

app/contao/composer.json

@@ -5,13 +5,12 @@
     "type": "project",
     "require": {
         "contao/calendar-bundle": "^4.13",
-        "contao/comments-bundle": "^4.13",
-        "contao/conflicts": "@dev",
+        "contao/conflicts": "*@dev",
         "contao/faq-bundle": "^4.13",
         "contao/listing-bundle": "^4.13",
         "contao/manager-bundle": "4.13.*",
         "contao/news-bundle": "^4.13",
-        "contao/newsletter-bundle": "^4.13"
+        "terminal42/contao-node": "^1.5"
     },
     "conflict": {
         "contao-components/installer": "<1.3"

app/contao/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1fcd1a779ed8abbabf8df5bb634078ad",
+    "content-hash": "89fa26d834bbaea4c73232d855938dc4",
     "packages": [
         {
             "name": "ausi/slug-generator",
@@ -262,6 +262,157 @@
             ],
             "time": "2022-02-21T13:15:14+00:00"
         },
+        {
+            "name": "codefog/contao-haste",
+            "version": "4.25.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/codefog/contao-haste.git",
+                "reference": "cc63998b4b10c2611cedb13b164250e1dda05a88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/codefog/contao-haste/zipball/cc63998b4b10c2611cedb13b164250e1dda05a88",
+                "reference": "cc63998b4b10c2611cedb13b164250e1dda05a88",
+                "shasum": ""
+            },
+            "require": {
+                "contao-community-alliance/composer-plugin": "~2.4 || ~3.0",
+                "contao/core-bundle": "^4.4",
+                "php": "~7.0 || ~8.0"
+            },
+            "replace": {
+                "contao-legacy/haste": "self.version"
+            },
+            "require-dev": {
+                "phpoffice/phpexcel": "^1.6",
+                "phpoffice/phpspreadsheet": "^1.6",
+                "phpunit/phpunit": "^9.2"
+            },
+            "suggest": {
+                "phpoffice/phpspreadsheet": "Required for the Haste\\IO\\ExcelFileWriter component."
+            },
+            "type": "contao-module",
+            "extra": {
+                "contao": {
+                    "sources": {
+                        "": "system/modules/haste"
+                    },
+                    "runonce": [
+                        "config/upgrade.php"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Haste\\": [
+                        "library/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Codefog",
+                    "homepage": "http://codefog.pl"
+                },
+                {
+                    "name": "terminal42 gmbh",
+                    "homepage": "https://www.terminal42.ch"
+                }
+            ],
+            "description": "haste extension for Contao Open Source CMS",
+            "keywords": [
+                "contao",
+                "haste"
+            ],
+            "support": {
+                "issues": "https://github.com/codefog/contao-haste/issues",
+                "source": "https://github.com/codefog/contao-haste/tree/4.25.21"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/codefog",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-07-25T05:23:15+00:00"
+        },
+        {
+            "name": "codefog/tags-bundle",
+            "version": "3.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/codefog/tags-bundle.git",
+                "reference": "667f396a13ea47433d042213a7b32a4ea68f7214"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/codefog/tags-bundle/zipball/667f396a13ea47433d042213a7b32a4ea68f7214",
+                "reference": "667f396a13ea47433d042213a7b32a4ea68f7214",
+                "shasum": ""
+            },
+            "require": {
+                "codefog/contao-haste": "^4.24",
+                "contao/core-bundle": "^4.4",
+                "doctrine/dbal": "^2.12 || ^3.0",
+                "ext-pdo": "*",
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "contao/manager-plugin": "<2.0 || >=3.0"
+            },
+            "require-dev": {
+                "contao/manager-plugin": "^2.0",
+                "contao/php-cs-fixer": "^2.2",
+                "contao/test-case": "^2.0",
+                "php-coveralls/php-coveralls": "^2.2",
+                "phpunit/phpunit": "^7.0 || ^9.3"
+            },
+            "type": "contao-bundle",
+            "extra": {
+                "contao-manager-plugin": "Codefog\\TagsBundle\\ContaoManager\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Codefog\\TagsBundle\\": "src/"
+                },
+                "classmap": [
+                    "src/DC_Tags.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Codefog",
+                    "homepage": "https://codefog.pl"
+                }
+            ],
+            "description": "Tags bundle for Contao Open Source CMS",
+            "keywords": [
+                "contao",
+                "tag",
+                "tagging",
+                "tags"
+            ],
+            "support": {
+                "issues": "https://github.com/codefog/tags-bundle/issues",
+                "source": "https://github.com/codefog/tags-bundle/tree/3.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/codefog",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-05-06T15:34:14+00:00"
+        },
         {
             "name": "composer/ca-bundle",
             "version": "1.3.3",
@@ -338,6 +489,55 @@
             ],
             "time": "2022-07-20T07:14:26+00:00"
         },
+        {
+            "name": "contao-community-alliance/composer-plugin",
+            "version": "3.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/contao-community-alliance/composer-plugin.git",
+                "reference": "05c8d6881f9866e2ba26635420ae173546f2ede2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/contao-community-alliance/composer-plugin/zipball/05c8d6881f9866e2ba26635420ae173546f2ede2",
+                "reference": "05c8d6881f9866e2ba26635420ae173546f2ede2",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^2.0",
+                "php": "^7.1 || ^8.0",
+                "symfony/finder": "^4.4 || ^5.2",
+                "symfony/process": "^4.4 || ^5.2"
+            },
+            "conflict": {
+                "contao/core": "*",
+                "contao/core-bundle": "<4.9"
+            },
+            "require-dev": {
+                "composer/composer": "^2.0",
+                "symfony/phpunit-bridge": "^3.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "ContaoCommunityAlliance\\Composer\\Plugin\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "ContaoCommunityAlliance\\Composer\\Plugin\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "description": "Composer plugin that provides installers for contao-module and legacy-contao-module.",
+            "homepage": "http://c-c-a.org/",
+            "support": {
+                "issues": "https://github.com/contao-community-alliance/composer-plugin/issues",
+                "source": "https://github.com/contao-community-alliance/composer-plugin/tree/3.2.2"
+            },
+            "time": "2022-04-01T14:57:10+00:00"
+        },
         {
             "name": "contao-components/ace",
             "version": "1.8.1",
@@ -1031,81 +1231,6 @@
             ],
             "time": "2022-07-05T11:01:11+00:00"
         },
-        {
-            "name": "contao/comments-bundle",
-            "version": "4.13.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/contao/comments-bundle.git",
-                "reference": "0aa6bd4126253496e173c830d276b5aa5abd3d1e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/contao/comments-bundle/zipball/0aa6bd4126253496e173c830d276b5aa5abd3d1e",
-                "reference": "0aa6bd4126253496e173c830d276b5aa5abd3d1e",
-                "shasum": ""
-            },
-            "require": {
-                "contao/core-bundle": "self.version",
-                "php": "^7.4 || ^8.0",
-                "symfony/http-kernel": "^5.4"
-            },
-            "conflict": {
-                "contao/core": "*",
-                "contao/manager-plugin": "<2.0 || >=3.0"
-            },
-            "require-dev": {
-                "contao/manager-plugin": "^2.0",
-                "symfony/http-client": "^5.4"
-            },
-            "type": "contao-bundle",
-            "extra": {
-                "contao-manager-plugin": "Contao\\CommentsBundle\\ContaoManager\\Plugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Contao\\CommentsBundle\\": "src/"
-                },
-                "classmap": [
-                    "src/Resources/contao/"
-                ],
-                "exclude-from-classmap": [
-                    "src/Resources/contao/config/",
-                    "src/Resources/contao/dca/",
-                    "src/Resources/contao/languages/",
-                    "src/Resources/contao/templates/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Leo Feyer",
-                    "homepage": "https://github.com/leofeyer"
-                },
-                {
-                    "name": "Contao Community",
-                    "homepage": "https://contao.org/contributors"
-                }
-            ],
-            "description": "Adds comments functionality to Contao",
-            "homepage": "https://contao.org",
-            "support": {
-                "docs": "https://docs.contao.org",
-                "forum": "https://community.contao.org",
-                "issues": "https://github.com/contao/contao/issues",
-                "source": "https://github.com/contao/comments-bundle"
-            },
-            "funding": [
-                {
-                    "url": "https://to.contao.org/donate",
-                    "type": "custom"
-                }
-            ],
-            "time": "2022-07-05T11:01:11+00:00"
-        },
         {
             "name": "contao/conflicts",
             "version": "dev-main",
@@ -1996,85 +2121,6 @@
             ],
             "time": "2022-07-05T11:01:11+00:00"
         },
-        {
-            "name": "contao/newsletter-bundle",
-            "version": "4.13.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/contao/newsletter-bundle.git",
-                "reference": "5b80e5aa1578ec5255c65e3403066dbd6d771b0d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/contao/newsletter-bundle/zipball/5b80e5aa1578ec5255c65e3403066dbd6d771b0d",
-                "reference": "5b80e5aa1578ec5255c65e3403066dbd6d771b0d",
-                "shasum": ""
-            },
-            "require": {
-                "contao/core-bundle": "self.version",
-                "php": "^7.4 || ^8.0",
-                "symfony/deprecation-contracts": "^2.1 || ^3.0",
-                "symfony/http-kernel": "^5.4"
-            },
-            "conflict": {
-                "contao/core": "*",
-                "contao/manager-plugin": "<2.0 || >=3.0"
-            },
-            "require-dev": {
-                "contao/manager-plugin": "^2.3.1",
-                "contao/test-case": "self.version",
-                "phpunit/phpunit": "^9.3",
-                "symfony/http-client": "^5.4",
-                "symfony/phpunit-bridge": "^5.4"
-            },
-            "type": "contao-bundle",
-            "extra": {
-                "contao-manager-plugin": "Contao\\NewsletterBundle\\ContaoManager\\Plugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Contao\\NewsletterBundle\\": "src/"
-                },
-                "classmap": [
-                    "src/Resources/contao/"
-                ],
-                "exclude-from-classmap": [
-                    "src/Resources/contao/config/",
-                    "src/Resources/contao/dca/",
-                    "src/Resources/contao/languages/",
-                    "src/Resources/contao/templates/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Leo Feyer",
-                    "homepage": "https://github.com/leofeyer"
-                },
-                {
-                    "name": "Contao Community",
-                    "homepage": "https://contao.org/contributors"
-                }
-            ],
-            "description": "Adds newsletter functionality to Contao",
-            "homepage": "https://contao.org",
-            "support": {
-                "docs": "https://docs.contao.org",
-                "forum": "https://community.contao.org",
-                "issues": "https://github.com/contao/contao/issues",
-                "source": "https://github.com/contao/newsletter-bundle"
-            },
-            "funding": [
-                {
-                    "url": "https://to.contao.org/donate",
-                    "type": "custom"
-                }
-            ],
-            "time": "2022-07-05T11:01:11+00:00"
-        },
         {
             "name": "dasprid/enum",
             "version": "1.0.3",
@@ -12084,6 +12130,78 @@
             ],
             "time": "2022-06-27T16:58:25+00:00"
         },
+        {
+            "name": "terminal42/contao-node",
+            "version": "1.5.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/terminal42/contao-node.git",
+                "reference": "c14221611b911d2206180861bf8487b96a63e9c7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/terminal42/contao-node/zipball/c14221611b911d2206180861bf8487b96a63e9c7",
+                "reference": "c14221611b911d2206180861bf8487b96a63e9c7",
+                "shasum": ""
+            },
+            "require": {
+                "codefog/contao-haste": "^4.21",
+                "codefog/tags-bundle": "^3.0",
+                "contao/core-bundle": "^4.4",
+                "doctrine/dbal": "^2.13 || ^3.0",
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "contao/manager-plugin": "<2.0 || >=3.0"
+            },
+            "require-dev": {
+                "contao/manager-plugin": "^2.0",
+                "terminal42/contao-geoip2-country": "^1.0"
+            },
+            "suggest": {
+                "terminal42/contao-geoip2-country": "Protect nodes in Contao using MaxMind GeoIP2 database"
+            },
+            "type": "contao-bundle",
+            "extra": {
+                "contao-manager-plugin": "Terminal42\\NodeBundle\\ContaoManager\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Terminal42\\NodeBundle\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "terminal42 gmbh",
+                    "homepage": "https://www.terminal42.ch"
+                }
+            ],
+            "description": "Node bundle for Contao Open Source CMS",
+            "keywords": [
+                "contao",
+                "content",
+                "node"
+            ],
+            "support": {
+                "issues": "https://github.com/terminal42/contao-node/issues",
+                "source": "https://github.com/terminal42/contao-node"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/terminal42",
+                    "type": "github"
+                },
+                {
+                    "url": "https://ko-fi.com/terminal42",
+                    "type": "other"
+                }
+            ],
+            "time": "2022-07-28T12:21:30+00:00"
+        },
         {
             "name": "terminal42/escargot",
             "version": "1.4.1",

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: mariadb
     container_name: mariadb
     ports:
-      - "3306:3306"
+      - "3307:3306"
     environment:
       MYSQL_ROOT_PASSWORD: root
     volumes:
@@ -14,7 +14,8 @@ services:
       - default
   contao:
     build:
-      dockerfile: ./Dockerfile
+      context: ./
+      dockerfile: Dockerfile
     image: php-apache-contao
     container_name: contao
     ports: