caddy

Caddyfile

@@ -0,0 +1,8 @@
+localhost:7860 {
+    reverse_proxy localhost:7860
+}
+
+localhost:7860/code {
+    reverse_proxy localhost:8080
+}
+

Dockerfile

@@ -42,11 +42,6 @@ RUN adduser --disabled-password --gecos '' --shell /bin/bash user \
  && chown -R user:user /app
 RUN echo "user ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/90-user
 
-#nginx
-RUN mkdir -p /var/cache/nginx /var/log/nginx /var/lib/nginx && \
-    touch /var/run/nginx.pid && \
-    chown -R user:user /var/cache/nginx /var/log/nginx /var/lib/nginx /var/run/nginx.pid
-
 # Fetch the latest version of OpenVSCode Server
 RUN curl -s https://api.github.com/repos/gitpod-io/openvscode-server/releases/latest \
     | grep "browser_download_url.*linux-x64.tar.gz" \
@@ -137,6 +132,7 @@ RUN --mount=target=requirements.txt,source=requirements.txt \
 
 # Copy the current directory contents into the container at $HOME/app setting the owner to the user
 COPY --chown=user . $HOME/app
+COPY --chown=user --from=caddy:2-alpine /usr/bin/caddy /usr/bin/caddy
 COPY --chown=user nginx.conf /etc/nginx/sites-available/default
 
 RUN chmod +x start_server.sh

nginx.conf

@@ -1,55 +0,0 @@
-server {
-    listen 4444 default_server;
-    listen [::]:4444 default_server;
-
-    server_name _;  # Modify your domain name accordingly
-
-    location / {
-        # Serve GRADIO 7860
-        proxy_pass http://localhost:7860;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        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_cache_bypass $http_upgrade;
-        proxy_read_timeout 86400;
-        proxy_redirect off;
-    }
-
-    location /code/ {
-        # Serve GRADIO 8080
-        proxy_pass http://localhost:8080;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        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_cache_bypass $http_upgrade;
-        proxy_read_timeout 86400;
-        proxy_redirect off;
-    }    
-
-    location /one/ {
-        client_max_body_size 64m;
-        proxy_http_version 1.1;
-        proxy_pass http://localhost:3000;  # Modify your port accordingly
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_cache_bypass $http_upgrade;
-        proxy_set_header Accept-Encoding gzip;
-    }
-
-    location /poe/ {
-        client_max_body_size 64m;
-        proxy_http_version 1.1;
-        proxy_pass http://localhost:3700;  # Modify your port accordingly
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $remote_addr;
-        proxy_cache_bypass $http_upgrade;
-        proxy_set_header Accept-Encoding gzip;
-    }
-}
-

packages.txt

@@ -1,7 +1,6 @@
 tree
 neofetch
 neovim
-nginx
 autossh
 tmux
 ripgrep

start_server.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-service nginx start 
+echo "Start Caddy"
+/usr/bin/caddy run --config /home/user/app/Caddyfile --adapter caddyfile
 
 #ssh -o StrictHostKeyChecking=no -R nya:80:localhost:7860 tunne.link -p8043 &
 autossh -M 0 -o "StrictHostKeyChecking=no" -R nya:80:localhost:7860 tunne.link -p8043