diff --git a/.env.example b/.env.example index 91fcefb..d1a4f8b 100644 --- a/.env.example +++ b/.env.example @@ -1,11 +1,9 @@ # Project APP_NAME=ktvcentral APP_DOMAIN=zqd.superstar.dnsnet.cc -APP_PORT=8080 -APP_URL=http://${APP_DOMAIN}:${APP_PORT} +APP_URL=http://zqd.superstar.dnsnet.cc REPO_URL=http://47.251.18.130:3000/Leecheng/KTVCentral.git -REPO_BRANCH=main # Database DB_DATABASE=KaraokeKingpin diff --git a/Dockerfile b/Dockerfile index d966901..1c69626 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ FROM php:8.3-fpm # ---- system & PHP extensions ------------------------------------------------- RUN apt-get update && apt-get install -y \ nginx \ + gettext \ git unzip zip curl ca-certificates supervisor cron nano \ libpng-dev libjpeg62-turbo-dev libfreetype6-dev \ libonig-dev libxml2-dev libzip-dev libpq-dev libicu-dev libxslt-dev \ @@ -25,7 +26,7 @@ COPY docker/php/opcache.ini /usr/local/etc/php/conf.d/opcache.ini COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY docker/entrypoint.sh /entrypoint.sh COPY docker/entrypoint.git.sh /entrypoint.git.sh -COPY docker/nginx/default.conf.template /etc/nginx/conf.d/default.conf +COPY docker/nginx/default.conf.template /etc/nginx/templates/default.conf.template WORKDIR /var/www diff --git a/docker-compose.yml b/docker-compose.yml index 1d99526..62b8caf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,14 +28,14 @@ services: - ./data/logs/php:/var/www/logs - ./data/nginx/conf.d/:/etc/nginx/conf.d/ - ./data/logs/nginx/:/var/log/nginx - - ./docker/nginx/default.conf.template:/etc/nginx/conf.d/default.conf + - ./docker/nginx/default.conf.template:/etc/nginx/templates/default.conf.template ports: - - "${APP_PORT}:80" + - "${APP_PORT:-80}:${APP_PORT:-80}" depends_on: - mariadb environment: REPO_URL: ${REPO_URL} - BRANCH: ${REPO_BRANCH} + BRANCH: ${REPO_BRANCH:-main} APP_NAME: ${APP_NAME} APP_URL: ${APP_URL} DB_HOST: mariadb @@ -44,7 +44,7 @@ services: DB_USERNAME: ${DB_USERNAME} DB_PASSWORD: ${DB_PASSWORD} NGINX_HOST: ${APP_DOMAIN} - NGINX_PORT: 80 + NGINX_PORT: ${APP_PORT:-80} networks: - app_network diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index e39c938..1ccb7f2 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -40,4 +40,5 @@ chmod -R 775 storage bootstrap/cache mkdir -p /var/www/logs supervisord -c /etc/supervisor/conf.d/supervisord.conf & php-fpm -D +envsubst "${NGINX_HOST} ${NGINX_PORT}" < /etc/nginx/templates/default.conf.template > /etc/nginx/conf.d/default.conf exec nginx -g "daemon off;" diff --git a/docker/nginx/default.conf.template b/docker/nginx/default.conf.template index 0d69adb..3e3225e 100644 --- a/docker/nginx/default.conf.template +++ b/docker/nginx/default.conf.template @@ -1,5 +1,5 @@ server { - listen 80; + listen ${NGINX_PORT}; server_name ${NGINX_HOST}; root /var/www/html/public;