diff --git a/.env.example b/.env.example index 033e99f..375088a 100644 --- a/.env.example +++ b/.env.example @@ -21,4 +21,7 @@ FRONTEND_SERVER_NAME=myapp.mydomain.com FRONTEND_URL=https://myapp.mydomain.com # BROWSERLESS -MAX_CONCURRENT_SESSIONS= \ No newline at end of file +MAX_CONCURRENT_SESSIONS= + +# PHPMYADMIN +PMA_PORT= \ No newline at end of file diff --git a/README.md b/README.md index a472776..b43c0cc 100644 --- a/README.md +++ b/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: diff --git a/docker-compose.phpmyadmin.yaml b/docker-compose.phpmyadmin.yaml new file mode 100644 index 0000000..2ee6ec3 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index c16c3c0..e397ab1 100644 --- a/docker-compose.yaml +++ b/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 diff --git a/frontend/.docker/add-env-vars.sh b/frontend/.docker/add-env-vars.sh index 4449379..e42efe0 100644 --- a/frontend/.docker/add-env-vars.sh +++ b/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; } diff --git a/frontend/.docker/nginx/conf.d/default.conf b/frontend/.docker/nginx/conf.d/default.conf index 1d6954e..6cb3403 100755 --- a/frontend/.docker/nginx/conf.d/default.conf +++ b/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 }};