From 247925345abbb9e9527e6f81012fd84ede2def1b Mon Sep 17 00:00:00 2001 From: Brian Cassidy Date: Wed, 4 Sep 2024 15:18:27 -0300 Subject: [PATCH] POS-6 adjustments for new dir structure and pre-init.d scripts --- Dockerfile | 7 +++---- build/nginx/app.conf | 1 - .../pre-init.d/55_wait_for_mysql_server.sh | 0 .../pre-init.d/57_triage_build.sh | 0 .../pre-init.d/58_deploy_instances.sh | 14 +++++++------- .../pre-init.d/60_install_ospos.sh | 2 +- build/scripts/pre-init.d/18_set_newrelic_env.sh | 5 ----- build/scripts/pre-init.d/90_enable_rsyslogd.sh | 17 ----------------- 8 files changed, 11 insertions(+), 35 deletions(-) rename build/scripts/{ => container}/pre-init.d/55_wait_for_mysql_server.sh (100%) rename build/scripts/{ => container}/pre-init.d/57_triage_build.sh (100%) rename build/scripts/{ => container}/pre-init.d/58_deploy_instances.sh (90%) rename build/scripts/{ => container}/pre-init.d/60_install_ospos.sh (69%) delete mode 100755 build/scripts/pre-init.d/18_set_newrelic_env.sh delete mode 100755 build/scripts/pre-init.d/90_enable_rsyslogd.sh diff --git a/Dockerfile b/Dockerfile index ab1be39..451ea12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,9 @@ RUN apk --no-cache add bash php81-mysqli php81-session php81-gd \ # patch -p1 < /build/patches/credit-payment-types.patch && \ # patch -p1 < /build/patches/detailed-sales-report-time.patch && \ find /build/app-config -name composer.json|xargs -n 1 dirname|xargs -n 1 composer install --prefer-dist -d && \ - mv /build/nginx/app.conf "$NGINX_APP_CONF_FILE" && \ - ${RSYNC_MOVE} /build/scripts/container/ /scripts/ -# && \ -# mv /build/www/index.html /app/html/public/index.html + ${RSYNC_MOVE} /build/nginx/app.conf "$NGINX_APP_CONF_FILE" && \ + ${RSYNC_MOVE} /build/scripts/container/ /scripts/ && \ + ${RSYNC_MOVE} /build/www/index.html /app/html/index.html # Volumes VOLUME /app/hil/public/uploads diff --git a/build/nginx/app.conf b/build/nginx/app.conf index 108c9d2..c1480a7 100644 --- a/build/nginx/app.conf +++ b/build/nginx/app.conf @@ -47,5 +47,4 @@ http { return 403; } } -} # APP CONFIG diff --git a/build/scripts/pre-init.d/55_wait_for_mysql_server.sh b/build/scripts/container/pre-init.d/55_wait_for_mysql_server.sh similarity index 100% rename from build/scripts/pre-init.d/55_wait_for_mysql_server.sh rename to build/scripts/container/pre-init.d/55_wait_for_mysql_server.sh diff --git a/build/scripts/pre-init.d/57_triage_build.sh b/build/scripts/container/pre-init.d/57_triage_build.sh similarity index 100% rename from build/scripts/pre-init.d/57_triage_build.sh rename to build/scripts/container/pre-init.d/57_triage_build.sh diff --git a/build/scripts/pre-init.d/58_deploy_instances.sh b/build/scripts/container/pre-init.d/58_deploy_instances.sh similarity index 90% rename from build/scripts/pre-init.d/58_deploy_instances.sh rename to build/scripts/container/pre-init.d/58_deploy_instances.sh index 6c90bdd..3d66652 100755 --- a/build/scripts/pre-init.d/58_deploy_instances.sh +++ b/build/scripts/container/pre-init.d/58_deploy_instances.sh @@ -10,16 +10,16 @@ if [[ "$DEPLOY_ENV" != "local" ]]; then echo "Deploying instance for \"${i}\"..." cp -r /tmp/ospos/* "/app/$i/" - cp /app-config/database.php "/app/$i/application/config/" + cp /build/app-config/database.php "/app/$i/application/config/" sed -i "s|MYSQL_DATABASE|MYSQL_DATABASE_${i^^}|g" "/app/$i/application/config/database.php" - if [[ -d "/app-config/$i/" ]] + if [[ -d "/build/app-config/$i/" ]] then - cp -r "/app-config/$i/" "/app/" + cp -r "/build/app-config/$i/" "/app/" fi NGINXDOM="$i" if [[ "$DEPLOY_ENV" = "dev" ]]; then NGINXDOM="dev-$i" - sed -i "s|https://${i}-pos|https://${NGINXDOM}-pos|g" /app/html/public/index.html + sed -i "s|https://${i}-pos|https://${NGINXDOM}-pos|g" /app/html/index.html fi CONFNEW=$(cat <> /etc/nginx/conf.d/app.conf +}" >> /etc/nginx/http.d/app.conf diff --git a/build/scripts/pre-init.d/60_install_ospos.sh b/build/scripts/container/pre-init.d/60_install_ospos.sh similarity index 69% rename from build/scripts/pre-init.d/60_install_ospos.sh rename to build/scripts/container/pre-init.d/60_install_ospos.sh index db0c447..10e9d26 100755 --- a/build/scripts/pre-init.d/60_install_ospos.sh +++ b/build/scripts/container/pre-init.d/60_install_ospos.sh @@ -3,6 +3,6 @@ if [ ! -f /tmp/OSPOS_DB_LIVE ] && [ "$DEPLOY_ENV" = "local" ]; then # Create Database. - mysql -uroot -p${MYSQL_ROOT_PASSWORD} -h ${MYSQL_HOSTNAME} -P ${MYSQL_PORT} -e "DROP DATABASE IF EXISTS ${MYSQL_DATABASE}; CREATE DATABASE ${MYSQL_DATABASE} CHARACTER SET utf8 COLLATE utf8_general_ci; CREATE USER '${MYSQL_USERNAME}'@'%' IDENTIFIED BY '$MYSQL_PASSWORD'; GRANT ALL PRIVILEGES ON ${MYSQL_DATABASE}.* TO '${MYSQL_USERNAME}'@'%' IDENTIFIED BY '$MYSQL_PASSWORD'; FLUSH PRIVILEGES;" + mysql -uroot -p${MYSQL_ROOT_PASSWORD} -h ${MYSQL_HOSTNAME} -P ${MYSQL_PORT} -e "DROP DATABASE IF EXISTS ${MYSQL_DATABASE}; CREATE DATABASE ${MYSQL_DATABASE} CHARACTER SET utf8 COLLATE utf8_general_ci; CREATE OR REPLACE USER '${MYSQL_USERNAME}'@'%' IDENTIFIED BY '$MYSQL_PASSWORD'; GRANT ALL PRIVILEGES ON ${MYSQL_DATABASE}.* TO '${MYSQL_USERNAME}'@'%' IDENTIFIED BY '$MYSQL_PASSWORD'; FLUSH PRIVILEGES;" mysql -uroot -p${MYSQL_ROOT_PASSWORD} -h ${MYSQL_HOSTNAME} -P ${MYSQL_PORT} ${MYSQL_DATABASE} < /app/html/database/database.sql fi diff --git a/build/scripts/pre-init.d/18_set_newrelic_env.sh b/build/scripts/pre-init.d/18_set_newrelic_env.sh deleted file mode 100755 index 235fb2b..0000000 --- a/build/scripts/pre-init.d/18_set_newrelic_env.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh -if [ -n "$DEPLOY_ENV" ] && [ -n "$NR_INSTALL_KEY" ] && [ ! "$DEPLOY_ENV" = "local" ]; then - sed -i "s|newrelic.appname = \"PHP Application\"|newrelic.appname = \"${SITE_URI}\"|g" /etc/php7/conf.d/newrelic.ini - sed -i "s|REPLACE_WITH_REAL_KEY|${NR_INSTALL_KEY}|g" /etc/php7/conf.d/newrelic.ini -fi diff --git a/build/scripts/pre-init.d/90_enable_rsyslogd.sh b/build/scripts/pre-init.d/90_enable_rsyslogd.sh deleted file mode 100755 index 86528c9..0000000 --- a/build/scripts/pre-init.d/90_enable_rsyslogd.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh -if [ "$LOGZIO_KEY" != "" ]; then - echo "Starting rsyslogd..." - - # Remove unsupported mod. - sed -i '/ModLoad imklog.so/d' /etc/rsyslog.conf - - # Add auth key. - sed -i "s|LOGZIO_KEY|$LOGZIO_KEY|g" /etc/rsyslog.d/21-logzio-nginx.conf - - # Inject environmental details. - sed -i "s|DEPLOY_ENV|$DEPLOY_ENV|g" /etc/rsyslog.d/21-logzio-nginx.conf - sed -i "s|DEPLOY_URI|$SITE_URI|g" /etc/rsyslog.d/21-logzio-nginx.conf - - # Start rsyslogd. - /usr/sbin/rsyslogd -f /etc/rsyslog.conf -fi