Changes related to #66

Author: null93

README.md

@@ -40,7 +40,38 @@ $ make VERSION=1.0.0 package
 
 ## Development Environment
 
-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.
+We use a super simple development environment that is ephemeral. You can spin it up by doing the following:
+
+```shell
+mkdir -p ./private/varnish
+cp conf/varnish/*.vcl ./private/varnish
+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`.
 
 ## Legal Disclaimer
 

conf/varnish/default.custom.vcl

@@ -0,0 +1,6 @@
+vcl 4.1;
+
+backend default {
+    .host = "magento";
+    .port = "8080";
+}

conf/varnish/default.vcl

@@ -1,13 +1,6 @@
 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:
@@ -18,9 +11,6 @@ services:
       - MARIADB_DATABASE=magento2
   magento:
     image: docker.io/bitnami/magento:2
-    ports:
-      - "80:8080"
-      - "443:8443"
     environment:
       - MAGENTO_HOST=localhost
       - MAGENTO_DATABASE_HOST=mariadb
@@ -30,17 +20,27 @@ services:
       - MAGENTO_USERNAME=jetrails
       - MAGENTO_PASSWORD=magento2
       - MAGENTO_MODE=developer
-      - MAGENTO_ENABLE_HTTPS=yes
-      - MAGENTO_ENABLE_ADMIN_HTTPS=yes
+      - MAGENTO_ENABLE_HTTPS=no
+      - MAGENTO_ENABLE_ADMIN_HTTPS=no
       - 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_HOST=magento
       - MAGENTO_HTTP_CACHE_BACKEND_PORT_NUMBER=8080
       - MAGENTO_HTTP_CACHE_SERVER_HOST=varnish
-      - MAGENTO_HTTP_CACHE_SERVER_PORT_NUMBER=8080
+      - MAGENTO_HTTP_CACHE_SERVER_PORT_NUMBER=80
     depends_on:
       - mariadb
-      - elasticsearch
+      - elasticsearch
+  varnish:
+    image: varnish:6
+    environment:
+      - VARNISH_SIZE=1G
+    volumes:
+      - ./private/varnish:/etc/varnish
+    ports:
+      - "80:80"
+    depends_on:
+      - magento