Beautiful Open-Source Form Builder
Issue 349/database not created (#372)
Don Benjamin1dd02cc147cf
diff --git a/Dockerfile b/Dockerfileindex 2a0ce691b..21500eda3 100644--- a/Dockerfile+++ b/Dockerfile@@ -57,8 +57,7 @@ FROM --platform=linux/amd64 ubuntu:23.04# supervisord is a process manager which will be responsible for managing the# various server processes. These are configured in docker/supervisord.conf--CMD ["/usr/bin/supervisord"]+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]WORKDIR /app@@ -69,8 +68,10 @@ RUN apt-get update \supervisor nginx sudo postgresql-15 redis\$PHP_PACKAGES php8.1-fpm wget\&& apt-get clean-RUN wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.39.3/install.sh | bash-RUN . /root/.nvm/nvm.sh && nvm install 20++RUN useradd nuxt && mkdir ~nuxt && chown nuxt ~nuxt+RUN wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.39.3/install.sh | sudo -u nuxt bash+RUN sudo -u nuxt bash -c ". ~nuxt/.nvm/nvm.sh && nvm install --no-progress 20"ADD docker/postgres-wrapper.sh docker/php-fpm-wrapper.sh docker/redis-wrapper.sh docker/nuxt-wrapper.sh docker/generate-api-secret.sh /usr/local/bin/ADD docker/php-fpm.conf /etc/php/8.1/fpm/pool.d/diff --git a/README.md b/README.mdindex 7728a6404..692c5f8a9 100644--- a/README.md+++ b/README.md@@ -101,7 +101,7 @@ Custom Nuxt .env file:docker run --name opnform -v $PWD/custom-nuxt-env-file.env:/app/client/.env -v $PWD/my-opnform-data:/persist -p 80:80 jhumanj/opnform```-This would load load in the env file located at `my-custom-env-file.env`, note that if you are creating a .env file for use like this it's best to start from the `.docker.env` example file as there are slightly different defaults for the dockerized setup.+This would load load in the env file located at `my-custom-env-file.env`, note that if you are creating a .env file for use like this it's best to start from the `.env.docker` example file as there are slightly different defaults for the dockerized setup.#### Using a custom HTTP portdiff --git a/docker/generate-api-secret.sh b/docker/generate-api-secret.shindex 6f5549466..e33ed58f0 100644--- a/docker/generate-api-secret.sh+++ b/docker/generate-api-secret.sh@@ -1,4 +1,4 @@-#!/bin/bash+#!/bin/bash -emain() {( flock -n 100 || wait_for_other_instance; generate_api_secrets) 100> /var/lock/api_secret.lock@@ -6,9 +6,9 @@ main() {generate_api_secrets() {if ! is_configured; then- SECRET=$(random_string)- add_secret_to_env_file /app/client/.env NUXT_API_SECRET $SECRET- add_secret_to_env_file /app/.env FRONT_API_SECRET $SECRET+ SECRET="$(random_string)"+ add_secret_to_env_file /app/client/.env NUXT_API_SECRET "$SECRET"+ add_secret_to_env_file /app/.env FRONT_API_SECRET "$SECRET"fi}@@ -27,7 +27,7 @@ add_secret_to_env_file() {VAR=$2VAL=$3- grep "^$VAR=" $FILE || ( echo $VAR= >> $FILE )+ grep "^$VAR=" "$FILE" || ( echo "$VAR=" >> "$FILE" )cp $FILE $TEMP_FILEsed "s/^$VAR=.*$/$VAR=$VAL/" -i $TEMP_FILEdiff --git a/docker/nuxt-wrapper.sh b/docker/nuxt-wrapper.shindex e205ac6dc..3b7f2084c 100644--- a/docker/nuxt-wrapper.sh+++ b/docker/nuxt-wrapper.sh@@ -1,15 +1,25 @@-#!/bin/bash+#!/bin/bash -e-. /root/.nvm/nvm.sh-nvm install 20+echo + . ~nuxt/.nvm/nvm.sh+. ~nuxt/.nvm/nvm.sh++echo + nvm install --no-progress 20+nvm install --no-progress 20+echo + nvm use 20nvm use 20cd /app/nuxt/server/-. /app/client/.env+echo + . /app/client/.env+[ -f /app/client/.env ] && . /app/client/.env || echo "Environment file missing!"-[ "x$NUXT_API_SECRET" != "x" ] || generate-api-secret.sh+[ "x$NUXT_API_SECRET" != "x" ] || (+ echo + generate-api-secret.sh+ generate-api-secret.sh+)+echo + eval \$\(sed 's/^/export /' \< /app/client/.env\)eval $(sed 's/^/export /' < /app/client/.env)+echo + node index.mjsnode index.mjsdiff --git a/docker/php-fpm-wrapper.sh b/docker/php-fpm-wrapper.shindex 846e00b86..13186db64 100644--- a/docker/php-fpm-wrapper.sh+++ b/docker/php-fpm-wrapper.sh@@ -1,4 +1,4 @@-#!/bin/bash +ex+#!/bin/bash -ex[ -L /app/storage ] || {echo "Backing up initial storage directory"@@ -19,20 +19,25 @@ chown opnform /var/log/opnform.logecho "Linking persistent storage into app"ln -t /app -sf /persist/storage-. /app/.env+read_env() {+ set +x+ . /app/.env+ set -x+}+read_env[ "x$APP_KEY" != "x" ] || {artisan key:generate- . /app/.env+ read_env}[ "x$JWT_SECRET" != "x" ] || {artisan jwt:secret -f- . /app/.env+ read_env}[ "x$FRONT_API_SECRET" != "x" ] || {generate-api-secret.sh- . /app/.env+ read_env}/usr/sbin/php-fpm8.1diff --git a/docker/postgres-wrapper.sh b/docker/postgres-wrapper.shindex 80f476991..083d5171a 100644--- a/docker/postgres-wrapper.sh+++ b/docker/postgres-wrapper.sh@@ -1,4 +1,4 @@-#!/bin/bash+#!/bin/bash -exDATA_DIR=/persist/pgsql/dataCONFIG_FILE=/etc/postgresql/postgresql.conf@@ -10,7 +10,9 @@ mkdir -p $DATA_DIRchown postgres -R $DATA_DIRchmod 0700 $DATA_DIR+set +x. /app/.env+set -xtest -f $DATA_DIR/postgresql.conf || NEW_DB=true@@ -41,6 +43,6 @@ EOFfiwait_for_database_to_be_ready-artisan migrate+sudo -u opnform artisan migrate --forcewaitdiff --git a/docker/redis-wrapper.sh b/docker/redis-wrapper.shindex afa14b10d..9e0f418db 100644--- a/docker/redis-wrapper.sh+++ b/docker/redis-wrapper.sh@@ -1,4 +1,4 @@-#!/bin/bash+#!/bin/bash -exsysctl vm.overcommit_memory=1mkdir -p /persist/redis/datadiff --git a/docker/supervisord.conf b/docker/supervisord.confindex bc7a4545e..ac0d2f439 100644--- a/docker/supervisord.conf+++ b/docker/supervisord.conf@@ -2,18 +2,17 @@nodaemon=truelogfile=/dev/nulllogfile_maxbytes=0+user=root[program:nginx]command=/usr/sbin/nginxstdout_logfile=/dev/stdout-stderr_logfile=/dev/stderrstdout_logfile_maxbytes=0redirect_stderr=true[program:php-fpm]command=/usr/local/bin/php-fpm-wrapper.shstdout_logfile=/dev/stdout-stderr_logfile=/dev/stderrstdout_logfile_maxbytes=0redirect_stderr=true@@ -21,7 +20,6 @@ redirect_stderr=trueprocess_name=%(program_name)s_%(process_num)02dcommand=/usr/local/bin/artisan queue:workstdout_logfile=/dev/stdout-stderr_logfile=/dev/stderrstdout_logfile_maxbytes=0redirect_stderr=truenumprocs=5@@ -29,21 +27,18 @@ numprocs=5[program:postgres]command=/usr/local/bin/postgres-wrapper.shstdout_logfile=/dev/stdout-stderr_logfile=/dev/stderrstdout_logfile_maxbytes=0redirect_stderr=true[program:redis]command=/usr/local/bin/redis-wrapper.shstdout_logfile=/dev/stdout-stderr_logfile=/dev/stderrstdout_logfile_maxbytes=0redirect_stderr=true[program:nuxt-backend]command=/usr/local/bin/nuxt-wrapper.shstdout_logfile=/dev/stdout-stderr_logfile=/dev/stderrstdout_logfile_maxbytes=0redirect_stderr=true-+user=nuxt