Merge pull request #389 from ricardoapaes/feature/docker-for-production-v3

🐳 Enhancing and Fixing Docker for Production

.env.example

@@ -21,4 +21,7 @@ FRONTEND_SERVER_NAME=myapp.mydomain.com
 FRONTEND_URL=https://myapp.mydomain.com
 
 # BROWSERLESS
-MAX_CONCURRENT_SESSIONS=
+MAX_CONCURRENT_SESSIONS=
+
+# PHPMYADMIN
+PMA_PORT=

README.md

@@ -49,6 +49,10 @@ docker run --name whaticketdb -e MYSQL_ROOT_PASSWORD=strongpassword -e MYSQL_DAT
 # Or run using `docker-compose` as below
 # Before copy .env.example to .env first and set the variables in the file.
 docker-compose up -d mysql
+
+# To administer this mysql database easily using phpmyadmin. 
+# It will run by default on port 9000, but can be changed in .env using `PMA_PORT`
+docker-compose -f docker-compose.phpmyadmin.yaml up -d
 ```
 
 Install puppeteer dependencies:
@@ -179,6 +183,10 @@ docker run --name whaticketdb -e MYSQL_ROOT_PASSWORD=strongpassword -e MYSQL_DAT
 # Or run using `docker-compose` as below
 # Before copy .env.example to .env first and set the variables in the file.
 docker-compose up -d mysql
+
+# To administer this mysql database easily using phpmyadmin. 
+# It will run by default on port 9000, but can be changed in .env using `PMA_PORT`
+docker-compose -f docker-compose.phpmyadmin.yaml up -d
 ```
 
 Clone this repository:

docker-compose.phpmyadmin.yaml

@@ -0,0 +1,15 @@
+version: '3'
+
+networks:
+  whaticket:
+
+services:
+
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin:latest
+    environment:
+      - PMA_HOSTS=mysql
+    ports:
+      - ${PMA_PORT:-9000}:80
+    networks:
+      - whaticket

docker-compose.yaml

@@ -22,6 +22,8 @@ services:
       - CHROME_ARGS=--no-sandbox --disable-setuid-sandbox
     ports:
       - ${BACKEND_PORT:-8080}:3000
+    volumes:
+      - ./backend/public/:/usr/src/app/public/
     networks:
       - whaticket
 

frontend/.docker/add-env-vars.sh

@@ -12,13 +12,16 @@ _addSslConfig() {
     SSL_CERTIFICATE=/etc/nginx/ssl/${1}/fullchain.pem;
     SSL_CERTIFICATE_KEY=/etc/nginx/ssl/${1}/privkey.pem;
     FILE_CONF=/etc/nginx/sites.d/${1}.conf
+    FILE_SSL_CONF=/etc/nginx/conf.d/00-ssl-redirect.conf;
 
     if [ -f ${SSL_CERTIFICATE} ] && [ -f ${SSL_CERTIFICATE_KEY} ]; then
         echo "saving ssl config in ${FILE_CONF}"
+        echo 'include include.d/ssl-redirect.conf;' >> ${FILE_SSL_CONF};
         echo 'include "include.d/ssl.conf";' >> ${FILE_CONF};
         echo "ssl_certificate ${SSL_CERTIFICATE};" >> ${FILE_CONF};
         echo "ssl_certificate_key ${SSL_CERTIFICATE_KEY};" >> ${FILE_CONF};
     else
+        echo 'listen 80;' >> ${FILE_CONF};
         echo "ssl ${1} not found >> ${SSL_CERTIFICATE} -> ${SSL_CERTIFICATE_KEY}"
     fi;
 }

frontend/.docker/nginx/conf.d/default.conf

@@ -1,4 +1,4 @@
-include include.d/ssl-redirect.conf;
+client_max_body_size 20M;
 
 upstream backend {
     server {{ .Env.URL_BACKEND }};