mama/star-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

還原 Dockerfile 與 Nginx proxy 設定至原始 port 80 配置
Some checks failed
Koori-ERP-Deploy-System / deploy-demo (push) Has been skipped
Details
Koori-ERP-Deploy-System / deploy-production (push) Failing after 24s
Details

Browse Source
This commit is contained in:
sky121113
2026-02-23 15:04:40 +08:00
parent 1acc4daebb
commit 8169ff3f59
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/8.5/Dockerfile
View File

@@ -11,7 +11,7 @@ WORKDIR /var/www/html
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=UTC ENV TZ=UTC
ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=8080" ENV SUPERVISOR_PHP_COMMAND="/usr/bin/php -d variables_order=EGPCS /var/www/html/artisan serve --host=0.0.0.0 --port=80"
ENV SUPERVISOR_PHP_USER="sail" ENV SUPERVISOR_PHP_USER="sail"
ENV PLAYWRIGHT_BROWSERS_PATH=0 ENV PLAYWRIGHT_BROWSERS_PATH=0
@@ -75,7 +75,7 @@ RUN apt-get update && apt-get upgrade -y \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
# setcap 已移除：正式機核心不允許 sysctl 設定，改用高位 port 8080 搭配 Nginx proxy RUN setcap "cap_net_bind_service=+ep" /usr/bin/php8.5
RUN userdel -r ubuntu RUN userdel -r ubuntu
RUN groupadd --force -g $WWWGROUP sail RUN groupadd --force -g $WWWGROUP sail
@@ -87,6 +87,6 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY php.ini /etc/php/8.5/cli/conf.d/99-sail.ini COPY php.ini /etc/php/8.5/cli/conf.d/99-sail.ini
RUN chmod +x /usr/local/bin/start-container RUN chmod +x /usr/local/bin/start-container
EXPOSE 8080/tcp EXPOSE 80/tcp
ENTRYPOINT ["start-container"] ENTRYPOINT ["start-container"]

4
nginx/demo-proxy.conf
View File

@@ -4,7 +4,7 @@ server {
server_name _; server_name _;
location / { location / {
proxy_pass http://star-erp-laravel:8080; proxy_pass http://star-erp-laravel:80;
proxy_set_header Host star-erp.demo; proxy_set_header Host star-erp.demo;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -19,7 +19,7 @@ server {
server_name _; server_name _;
location / { location / {
proxy_pass http://star-erp-laravel:8080; proxy_pass http://star-erp-laravel:80;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

2
nginx/prod-proxy.conf
View File

@@ -12,7 +12,7 @@ server {
server_name erp.koori.tw erp.mamaiclub.com; server_name erp.koori.tw erp.mamaiclub.com;
location / { location / {
proxy_pass http://star-erp-laravel:8080; proxy_pass http://star-erp-laravel:80;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;