Removed the seperate frontend Dockerfile, we always include it

MailerQ-Server-Frontend/Dockerfile → Dockerfile

@@ -18,7 +18,7 @@ RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/mailerq-packages.gpg] ht
 RUN apt-get update && apt-get install -y mailerq-server mailerq-frontend && rm -rf /var/lib/apt/lists/*
 
 # copy our entry script to the machine
-COPY ../MailerQ-Server/mq-entry.sh /usr/bin/mq-entry.sh
+COPY mq-entry.sh /usr/bin/mq-entry.sh
 
 # run MailerQ server
 ENTRYPOINT ["/usr/bin/mq-entry.sh"]

README.md

@@ -10,9 +10,9 @@ To use the Docker images, you need a MailerQ license key. If you already have a
 The easiest way to run MailerQ for the first time is to use our example [docker-compose.yaml](#docker-compose), as this includes the required RabbitMQ and MySQL instances and a minimal configuration file.
 
 ### Docker Compose
-An example `docker-compose.yaml` is provided in the [docker-compose](https://github.com/CopernicaMarketingSoftware/mailerq-server-docker/tree/main/docker-compose) folder. Next to the docker-compose file, you'll find a minimal config that works out of the box with the example. The docker-compose is based on the MailerQ-Server-Frontend image, which makes the MailerQ management console available on [localhost:8080](http://localhost:8080).
+An example `docker-compose.yaml` is provided in the [docker-compose](https://github.com/CopernicaMarketingSoftware/mailerq-server-docker/tree/main/docker-compose) folder. Next to the docker-compose file, you'll find a minimal config that works out of the box with the example. The docker-compose is based on the MailerQ-Server image, which makes the MailerQ management console available on [localhost:8080](http://localhost:8080).
 
-To run docker-compose, you need to set the environment variable `LICENSE_KEY` on your host system with a valid MailerQ [license](#license).
+To run docker-compose, you need to set the environment variable `MQ_LICENSE_KEY` on your host system with a valid MailerQ [license](#license).
 
 ### Docker File
 If you want to use the MailerQ images without using the docker-compose file, you need to make RabbitMQ and MySQL instances available for MailerQ.
@@ -42,13 +42,6 @@ www-auth: hardcoded://mailerq:mailerq
 A requirement, next to the config file, is the MailerQ license key or file. You can either mount an existing license file or give the `LICENSE_KEY` environment variable to the Dockerfile so it can generate a license.
 
 #### Example
-##### Without Management Console
-```bash
-docker build ./MailerQ-Server/ -t mailerq-server
-docker run -e LICENSE_KEY=<your_mailerq_license_key> -v /path/to/minimal-config.txt:/etc/mailerq/config.txt mailerq-server
-```
-
-##### With Management Console
 ```bash
 docker build ./MailerQ-Server-Frontend/ -t mailerq-server-frontend
 docker run -e LICENSE_KEY=<your_mailerq_license_key> -v /path/to/minimal-config.txt:/etc/mailerq/config.txt mailerq-server

docker-compose/docker-compose.yaml

@@ -43,11 +43,11 @@ services:
     container_name: mailerq
 
     # build the Dockerfile in the mailerq directory
-    build: ../MailerQ-Server-Frontend/
+    build: ../
 
     # pass on the MailerQ license key
     environment:
-      - LICENSE_KEY=${LICENSE_KEY}
+      - LICENSE_KEY=${MQ_LICENSE_KEY}
 
     # open up the port for the webinterface
     ports: