Raymond Weitekamp commited on
Commit
b9eab82
·
1 Parent(s): 13e4b0a

Fix Nginx permissions and viewer URL handling

Browse files
Files changed (2) hide show
  1. Dockerfile +17 -6
  2. cadviewer.py +2 -2
Dockerfile CHANGED
@@ -32,11 +32,20 @@ COPY . .
32
  # Set up startup script with correct permissions
33
  RUN chmod +x start.sh
34
 
35
- # Configure Nginx
36
- RUN mkdir -p /run/nginx && \
37
- chown -R www-data:www-data /run/nginx && \
 
 
 
 
 
38
  chown -R www-data:www-data /var/log/nginx && \
39
- chown -R www-data:www-data /var/lib/nginx
 
 
 
 
40
 
41
  # Create a non-root user and set up home directory
42
  RUN useradd -m -d /home/appuser -s /bin/bash appuser && \
@@ -61,9 +70,11 @@ RUN wget https://github.com/gitpod-io/openvscode-server/releases/download/openvs
61
  rm /tmp/openvscode-server.tar.gz && \
62
  mv /opt/openvscode-server-v1.86.2-linux-x64 /opt/openvscode-server
63
 
64
- # Set permissions for the entire /code directory
65
  RUN chown -R appuser:appuser /code && \
66
- chown -R appuser:appuser /opt/openvscode-server
 
 
67
 
68
  # Switch to non-root user
69
  USER appuser
 
32
  # Set up startup script with correct permissions
33
  RUN chmod +x start.sh
34
 
35
+ # Configure Nginx with proper permissions
36
+ RUN mkdir -p /var/lib/nginx/body && \
37
+ mkdir -p /var/lib/nginx/fastcgi && \
38
+ mkdir -p /var/lib/nginx/proxy && \
39
+ mkdir -p /var/lib/nginx/scgi && \
40
+ mkdir -p /var/lib/nginx/uwsgi && \
41
+ mkdir -p /run/nginx && \
42
+ chown -R www-data:www-data /var/lib/nginx && \
43
  chown -R www-data:www-data /var/log/nginx && \
44
+ chown -R www-data:www-data /run/nginx && \
45
+ chmod 755 /var/lib/nginx && \
46
+ chmod -R 755 /var/lib/nginx/* && \
47
+ chmod -R 755 /var/log/nginx && \
48
+ chmod -R 755 /run/nginx
49
 
50
  # Create a non-root user and set up home directory
51
  RUN useradd -m -d /home/appuser -s /bin/bash appuser && \
 
70
  rm /tmp/openvscode-server.tar.gz && \
71
  mv /opt/openvscode-server-v1.86.2-linux-x64 /opt/openvscode-server
72
 
73
+ # Set permissions for the entire /code directory and nginx config
74
  RUN chown -R appuser:appuser /code && \
75
+ chown -R appuser:appuser /opt/openvscode-server && \
76
+ chown -R appuser:appuser /etc/nginx && \
77
+ chmod -R 755 /etc/nginx
78
 
79
  # Switch to non-root user
80
  USER appuser
cadviewer.py CHANGED
@@ -198,8 +198,8 @@ with ui.splitter().classes(
198
  space_url = os.getenv('SPACE_URL', '')
199
  logger.info(f"Space URL: {space_url}")
200
 
201
- # Construct the viewer URL - always use /viewer since Nginx handles the routing
202
- viewer_url = "/viewer"
203
  logger.info(f"Using viewer URL: {viewer_url}")
204
 
205
  ocpcv = (
 
198
  space_url = os.getenv('SPACE_URL', '')
199
  logger.info(f"Space URL: {space_url}")
200
 
201
+ # Construct the viewer URL - use relative path for both local and Space environments
202
+ viewer_url = "/proxy/3939/viewer"
203
  logger.info(f"Using viewer URL: {viewer_url}")
204
 
205
  ocpcv = (