diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 84050b95..0b32f4ee 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -32,5 +32,7 @@ RUN cp -rp /etc/nginx /etc/nginx.orig # Set PATH to include Go installation and default go install binary location ENV PATH="/usr/local/go/bin:/root/go/bin:${PATH}" +ENV NGINX_UI_WORKING_DIR=/var/run/ + # set zsh as default shell RUN chsh -s $(which zsh) diff --git a/Dockerfile b/Dockerfile index ca5a10ef..b21c5d62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ ARG TARGETVARIANT EXPOSE 80 443 ENV NGINX_UI_OFFICIAL_DOCKER=true +ENV NGINX_UI_WORKING_DIR=/var/run/ # register nginx-ui service COPY resources/docker/nginx-ui.run /etc/s6-overlay/s6-rc.d/nginx-ui/run diff --git a/demo.Dockerfile b/demo.Dockerfile index b36c9cb9..2a358a3d 100644 --- a/demo.Dockerfile +++ b/demo.Dockerfile @@ -6,6 +6,8 @@ ARG TARGETVARIANT WORKDIR /app EXPOSE 80 +ENV NGINX_UI_WORKING_DIR=/var/run/ + # copy demo config COPY resources/demo/ojbk.me /etc/nginx/sites-available/ojbk.me RUN ln -s /etc/nginx/sites-available/ojbk.me /etc/nginx/sites-enabled/ojbk.me diff --git a/go.mod b/go.mod index 5922ef0b..4a19e464 100644 --- a/go.mod +++ b/go.mod @@ -313,7 +313,7 @@ require ( ) replace ( - code.pfad.fr/risefront => github.com/nginxui/risefront v1.1.10 + code.pfad.fr/risefront => github.com/nginxui/risefront v1.2.0 github.com/tufanbarisyildirim/gonginx => github.com/0xJacky/gonginx v0.0.0-20250420001451-d120448e89a4 gorm.io/gorm => gorm.io/gorm v1.25.12 gorm.io/plugin/dbresolver => gorm.io/plugin/dbresolver v1.5.3 diff --git a/go.sum b/go.sum index 881ab417..b4c4acd0 100644 --- a/go.sum +++ b/go.sum @@ -1522,6 +1522,8 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/nginxui/risefront v1.1.10 h1:8gy6fs89nha3TIZWFSkoMn6KZ6Qn3dFj3Jop3+E1tsc= github.com/nginxui/risefront v1.1.10/go.mod h1:QX3OyvazX3Mi/X2NZKl9ylDrFVUeaogwSMKyEsnRCHE= +github.com/nginxui/risefront v1.2.0 h1:r/C5+mPs1V76EKEQl966Kl0UpbJnnC/a38ZLYtlvnT4= +github.com/nginxui/risefront v1.2.0/go.mod h1:QX3OyvazX3Mi/X2NZKl9ylDrFVUeaogwSMKyEsnRCHE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nikoksr/notify v1.3.0 h1:UxzfxzAYGQD9a5JYLBTVx0lFMxeHCke3rPCkfWdPgLs= github.com/nikoksr/notify v1.3.0/go.mod h1:Xor2hMmkvrCfkCKvXGbcrESez4brac2zQjhd6U2BbeM=