diff --git a/Dockerfile.client b/Dockerfile.client index 0e7b2d2..8408326 100644 --- a/Dockerfile.client +++ b/Dockerfile.client @@ -12,5 +12,6 @@ RUN yarn build --production FROM nginx:stable-alpine COPY --from=build-step /frontend/build /usr/share/nginx/html EXPOSE 80 -COPY deployment/nginx.conf /etc/nginx/conf.d/.conf +COPY deployment/nginx.template /etc/nginx/nginx.template + CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/deployment/nginx.conf b/deployment/nginx.conf index a3eb414..85aaca7 100644 --- a/deployment/nginx.conf +++ b/deployment/nginx.conf @@ -1,21 +1,21 @@ -events {} -http +server { - server - { - listen 80; - server_name localhost; - - location /api { - proxy_pass http://localhost:8080; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - location / { - try_files $uri /index.html; - add_header Cache-Control "no-cache"; - } + listen 80; + server_name localhost; + + root /usr/share/nginx/html; + index index.html; + error_page 500 502 503 504 /50x.html; + + location /api { + proxy_pass $codex_url; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + location / { + try_files $uri /index.html; + add_header Cache-Control "no-cache"; } } \ No newline at end of file diff --git a/deployment/nginx.template b/deployment/nginx.template new file mode 100644 index 0000000..85aaca7 --- /dev/null +++ b/deployment/nginx.template @@ -0,0 +1,21 @@ +server +{ + listen 80; + server_name localhost; + + root /usr/share/nginx/html; + index index.html; + error_page 500 502 503 504 /50x.html; + + location /api { + proxy_pass $codex_url; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + location / { + try_files $uri /index.html; + add_header Cache-Control "no-cache"; + } +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 9bb8f8f..020ea5d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,13 +7,6 @@ services: ports: - "3000:80" environment: - - CODEX=http://localhost:8080 - - nginx: - image: nginx:alpine + - codex_url=http://host.docker.internal:8080 volumes: - - ./deployment/nginx.conf:/etc/nginx/nginx.conf:ro - ports: - - "8070:80" - depends_on: - - client \ No newline at end of file + - ./deployment/nginx.template:/etc/nginx/templates/10-variables.conf.template:ro \ No newline at end of file diff --git a/frontend/src/pages/debug/DebugPage.tsx b/frontend/src/pages/debug/DebugPage.tsx index cbff243..ec535ea 100644 --- a/frontend/src/pages/debug/DebugPage.tsx +++ b/frontend/src/pages/debug/DebugPage.tsx @@ -19,7 +19,7 @@ function DebugPage() { useEffect(() => { axios .get( - `/api/api/codex/v1/debug/info`, + `/api/codex/v1/debug/info`, { headers: (nodeInfo.auth && {