Fixed #66

Author: null93

.gitignore

@@ -8,3 +8,4 @@ composer.lock
 /private/
 /public_html/
 /vendor/
+/build/

.magento.docker.yml

@@ -1,70 +1,40 @@
 VENDOR=JetRails
 MODULE=Varnish
-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 Model etc Helper Logger Observer view registration.php
 MODULE_FILES_EXTRA=composer.json LICENSE.md
 
-.PHONY: bump deploy watch package clean nuke dev-create dev-up dev-down dev-nuke
+.PHONY: bump deploy build package clean
 
 bump: ## Bump version in source files based on latest git tag
-	VERSION=$(VERSION); find Block Console Controller Model etc Helper Logger Observer view registration.php -type f -iname "*.php" -exec sed -E -i '' "s/([\t ]+\*[\t ]+@version[\t ]+)(.*)/\1$$VERSION/g" {} +
+	VERSION=$(VERSION); find $(MODULE_FILES) -type f -iname "*.php" -exec sed -E -i '' "s/([\t ]+\*[\t ]+@version[\t ]+)(.*)/\1$$VERSION/g" {} +
 	VERSION=$(VERSION); sed -E -i '' "s/(Version-)(.+)(-lightgrey)/\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>)(.+)(<\/version>)/\1$$VERSION\3/g" ./etc/config.xml
 	VERSION=$(VERSION); sed -E -i '' "s/setup_version=\"([^\"]+)\"/setup_version=\"$$VERSION\"/g" ./etc/module.xml
 	VERSION=$(VERSION); sed -E -i '' "s/schema_version=\"([^\"]+)\"/schema_version=\"$$VERSION\"/g" ./etc/module.xml
 	VERSION=$(VERSION); sed -E -i '' "s/const MODULE_VERSION = \"([^\"]+)\"/const MODULE_VERSION = \"$$VERSION\"/g" ./Helper/Data.php
 
-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
-
+build: ## Copy over files to build directory
+	rm -rf ./build/$(NAMESPACE_PATH)
+	mkdir -p ./build/$(NAMESPACE_PATH)
+	rsync -uavq $(MODULE_FILES) ./build/$(NAMESPACE_PATH)
+
+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 ## 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
-
-nuke: clean ## Remove generated & deployment data
-	rm -rf ./public_html
-
-shell: ## Attach a shell to deploy container
-	docker-compose -f public_html/docker-compose.yml run deploy bash
-
-restart-varnish: ## Restart varnish container (updated vcl file)
-	docker-compose -f public_html/docker-compose.yml -f public_html/docker-compose.override.yml restart varnish
-
-dev-create: ## Create development environment
-	composer global config repositories.magento composer https://repo.magento.com/
-	composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition=2.4.4 ./public_html
-	cd public_html && ln -s ../docker-only.vcl ./default.vcl
-	cd public_html && ln -s ../docker-only.custom.vcl ./default.custom.vcl
-	cd public_html && ln -s ../.magento.docker.yml ./.magento.docker.yml
-	cd public_html && ln -s ../.magento.setup.params ./.magento.setup.params
-	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 --with-test --with-selenium --mode developer
-	cd public_html && docker-compose up -d
-	cd public_html && docker-compose run --rm deploy bin/magento setup:install `cat .magento.setup.params | tr '\n' ' '` ;
-	cd public_html && docker-compose run --rm deploy magento-command deploy:mode:set developer
-	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
-
-dev-up: ## Spin development environment up
-	cd public_html && docker-compose up -d
-
-dev-down: ## Spin development environment down
-	cd public_html && docker-compose down
-
-dev-nuke: dev-down nuke ## Spin development environment down
-	docker volume rm public_html_magento-development-magento-db
+	rm -rf ./dist ./build
 
 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

@@ -0,0 +1,46 @@
+version: "2"
+
+services:
+  varnish:
+    image: varnish:6
+    environment:
+      - VARNISH_HTTP_PORT=8080
+      - VARNISH_SIZE=1G
+    volumes:
+      - ./private/default.vcl:/etc/varnish/default.vcl
+  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
+    ports:
+      - "80:8080"
+      - "443:8443"
+    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=yes
+      - MAGENTO_HTTP_CACHE_BACKEND_HOST=localhost
+      - MAGENTO_HTTP_CACHE_BACKEND_PORT_NUMBER=8080
+      - MAGENTO_HTTP_CACHE_SERVER_HOST=varnish
+      - MAGENTO_HTTP_CACHE_SERVER_PORT_NUMBER=8080
+    depends_on:
+      - mariadb
+      - elasticsearch