Fixed #93

Author: null93

.gitignore

@@ -12,3 +12,4 @@ dist
 node_modules
 private
 public_html
+build

.magento.docker.yml

@@ -1,75 +1,41 @@
 VENDOR=JetRails
 MODULE=Cloudflare
-MAGENTO_VERSION=2.4.4
-MAGENTO_EDITION=community
-NAMESPACE=$(VENDOR)"_"$(MODULE)
-NAMESPACE_PATH=$(VENDOR)"/"$(MODULE)
+NAMESPACE=$(VENDOR)_$(MODULE)
+NAMESPACE_PATH=$(VENDOR)/$(MODULE)
 VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1`)
 MODULE_FILES=Block Console Controller Helper Model etc view registration.php
 MODULE_FILES_EXTRA=composer.json LICENSE.md
 
-.PHONY: deps build bump deploy watch package clean nuke dev-create dev-up dev-down dev-nuke
+.PHONY: deps build bump deploy package clean help
 
 deps: ## Download dependencies
 	yarn install
 
 build: ## Build styles and scripts
 	yarn build
+	rm -rf ./build/$(NAMESPACE_PATH)
+	mkdir -p ./build/$(NAMESPACE_PATH)
+	rsync -uavq $(MODULE_FILES) ./build/$(NAMESPACE_PATH)
 
 bump: ## Bump version in source files based on latest git tag
 	VERSION=$(VERSION); find Block Console Controller Helper Model etc view -type f -iname "*.php" -exec sed -E -i '' "s/([\t ]+\*[\t ]+@version[\t ]+)(.*)/\1$$VERSION/g" {} +
 	VERSION=$(VERSION); sed -E -i '' "s/(Version-)(.+)(-orange)/\1$$VERSION\3/g" ./README.md
 	VERSION=$(VERSION); sed -E -i '' "s/(\"version\": \")(.+)(\")/\1$$VERSION\3/g" ./composer.json
 	VERSION=$(VERSION); sed -E -i '' "s/(\"version\": \")(.+)(\")/\1$$VERSION\3/g" ./package.json
 
-deploy: ## Deploy code to public_html directory
-	NAMESPACE_PATH=$(NAMESPACE_PATH); mkdir -p "./public_html/app/code/$$NAMESPACE_PATH"
-	NAMESPACE_PATH=$(NAMESPACE_PATH); rsync -uavq $(MODULE_FILES) "./public_html/app/code/$$NAMESPACE_PATH"
-
-watch: deploy ## Intermittently sync code to public_html directory
-	fswatch -o $(MODULE_FILES) | xargs -n1 -I{} make deploy
+deploy: build ## Deploy code to docker container
+	docker compose exec magento rm -rf /bitnami/magento/app/code/$(NAMESPACE_PATH)
+	docker compose exec magento mkdir -p /bitnami/magento/app/code/$(NAMESPACE_PATH)
+	docker compose cp ./build/$(NAMESPACE_PATH) magento:/bitnami/magento/app/code/$(VENDOR)
+	docker compose exec magento chown -R daemon:root /bitnami/magento/app/code
 
 package: bump build ## Package into archive file
 	rm -rf ./dist
 	mkdir -p ./dist
-	VERSION=$(VERSION); NAMESPACE=$(NAMESPACE); zip -r dist/$$NAMESPACE-$$VERSION.zip $(MODULE_FILES) $(MODULE_FILES_EXTRA)
+	zip -r dist/$(NAMESPACE)-$(VERSION).zip $(MODULE_FILES) $(MODULE_FILES_EXTRA)
 
 clean: ## Remove generated files and folders
-	rm -rf ./dist ./.parcel-cache
-
-nuke: clean ## Remove generated & deployment data
-	rm -rf ./node_modules ./public_html
-
-install-from-magento: ## Install module from official Magento repo (for testing)
-	docker-compose -f ./public_html/docker-compose.yml run --rm build composer require --no-ansi jetrails/magento2-cloudflare:1.4.0
-
-shell: ## Spawn a shell
-	docker-compose -f ./public_html/docker-compose.yml run --rm deploy bash
-
-dev-create: ## Create development environment
-	composer global config repositories.magento composer https://repo.magento.com/
-	composer create-project --prefer-dist --repository-url=https://repo.magento.com/ magento/project-$(MAGENTO_EDITION)-edition=$(MAGENTO_VERSION) ./public_html
-	cp .magento.docker.yml .magento.setup.params ./public_html
-	cd public_html && ln -s ../docker-compose.override.yml ./docker-compose.override.yml
-	cd public_html && composer require magento/ece-tools -w
-	cd public_html && ./vendor/bin/ece-docker build:compose --no-varnish --mode developer
-	cd public_html && docker-compose up -d
-	cd public_html && docker-compose run --rm deploy composer self-update --2
-	cd public_html && docker-compose run --rm deploy magento-command setup:install `cat .magento.setup.params | tr '\n' ' '` ;
-	cd public_html && docker-compose run --rm deploy magento-command module:disable Magento_TwoFactorAuth
-	cd public_html && docker-compose run --rm deploy magento-command cache:flush
-	cd public_html && docker-compose run --rm deploy magento-command deploy:mode:set developer -s
-	# cd public_html && docker-compose run --rm deploy magento-command setup:static-content:deploy --jobs 4
-	cd public_html && docker-compose run --rm deploy magento-command setup:di:compile
-
-dev-up: ## Spin development environment up
-	docker-compose -f ./public_html/docker-compose.yml up -d
-
-dev-down: ## Spin development environment down
-	docker-compose -f ./public_html/docker-compose.yml down
-
-dev-nuke: dev-down nuke ## Spin development environment down
-	docker volume rm public_html_magento-development-magento-db
+	rm -rf ./dist ./build ./.parcel-cache
 
 help: ## Display available commands
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

.magento.setup.params

@@ -11,10 +11,42 @@
 </p>
 
 ## Documentation
+
 The user guide can be found [here](https://learn.jetrails.com/article/magento-2-cloudflare-extension).  The user guide goes through the installation process as well as explains all the features that comes with this extension. For further support, please email [development@jetrails.com](mailto://development@jetrails.com).
 
 ## Build System
+
 A simple [Makefile](Makefile) is used as a build system. Run `make help` to see available commands.
 
-## Development
-Run `make dev-create` to create a docker development environment using the [magento-cloud-docker](https://github.com/magento/magento-cloud-docker) project. Run `make dev-down` spin the environment down, `make dev-up` to spin it back up, and `make dev-nuke` to completely remove everything that is ephemeral.
+## Development Environment
+
+We use a super simple development environment that is ephemeral. You can spin it up by doing the following:
+
+```shell
+docker compose up -d
+docker compose logs -f
+docker compose down # destroy environment
+```
+
+You can deploy the module into the development environment by running the following:
+
+```shell
+make clean
+make build
+make deploy
+```
+
+You can then access the magento container by running the following:
+
+```shell
+docker compose exec magento bash
+```
+
+Once in the container you can run the standard commands to install the module:
+
+```shell
+magento setup:upgrade
+magento setup:di:compile
+```
+
+The Magento site is hosted on http://localhost and the backend can be reached at http://localhost/admin. Default user name is `jetrails` and default password is `magento2`.

Makefile

@@ -0,0 +1,35 @@
+version: "2"
+
+services:
+  elasticsearch:
+    image: docker.io/bitnami/elasticsearch:7
+  mariadb:
+    image: docker.io/bitnami/mariadb:10.3
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+      - MARIADB_USER=magento2
+      - MARIADB_DATABASE=magento2
+  magento:
+    image: docker.io/bitnami/magento:2
+    environment:
+      - MAGENTO_HOST=localhost
+      - MAGENTO_DATABASE_HOST=mariadb
+      - MAGENTO_DATABASE_PORT_NUMBER=3306
+      - MAGENTO_DATABASE_USER=magento2
+      - MAGENTO_DATABASE_NAME=magento2
+      - MAGENTO_USERNAME=jetrails
+      - MAGENTO_PASSWORD=magento2
+      - MAGENTO_MODE=developer
+      - MAGENTO_ENABLE_HTTPS=yes
+      - MAGENTO_ENABLE_ADMIN_HTTPS=yes
+      - MAGENTO_ADMIN_URL_PREFIX=admin
+      - ELASTICSEARCH_HOST=elasticsearch
+      - ELASTICSEARCH_PORT_NUMBER=9200
+      - ALLOW_EMPTY_PASSWORD=yes
+      - MAGENTO_ENABLE_HTTP_CACHE=no
+    ports:
+      - '80:8080'
+      - '443:8443'
+    depends_on:
+      - mariadb
+      - elasticsearch