[Fix] 🤗 Surprise

Dockerfile

@@ -1,34 +1,35 @@
-FROM ubuntu:latest
+FROM node:18-alpine
 
-ENV USER ${USER:-user}
+ENV USER ${USER:-node}
 ENV USER_ID ${USER_ID:-1000}
 
 WORKDIR /app
 
 COPY . /app
 
-RUN apt-get update && apt-get install -y python3 python3-pip nginx curl supervisor
+RUN apk add curl wget supervisor git
 
-RUN pip install Flask
+RUN git clone https://github.com/Harry-zklcdc/BingAPI-Demo.git && \
+    cd BingAPI-Demo && \
+    npm install && \
+    npm run build 
 
 RUN curl -L https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64 -o cloudflared && \
     chmod +x cloudflared
 
-COPY supervisor.conf /etc/supervisor/conf.d/supervisor.conf
+RUN curl -L https://github.com/Harry-zklcdc/go-proxy-bingai/releases/latest/download/go-proxy-bingai-linux-amd64.tar.gz -o go-proxy-bingai-linux-amd64.tar.gz && \
+    tar -xvf go-proxy-bingai-linux-amd64.tar.gz && \
+    chmod +x go-proxy-bingai && \
+    rm go-proxy-bingai-linux-amd64.tar.gz
 
-RUN groupadd -g $USER_ID $USER
-RUN useradd -rm -G sudo -u $USER_ID -g $USER_ID $USER
+COPY supervisor.conf /etc/supervisor/conf.d/supervisor.conf
 
-RUN mkdir -p /var/run/supervisor /var/log/supervisor /var/log/nginx /var/lib/nginx/body /var/lib/nginx/proxy /var/lib/nginx/fastcgi /var/lib/nginx/uwsgi /var/lib/nginx/scgi
-RUN chown "${USER_ID}:${USER_ID}" /var/run/supervisor /var/log/supervisor /var/log/nginx /var/lib/nginx/body /var/lib/nginx/proxy /var/lib/nginx/fastcgi /var/lib/nginx/uwsgi /var/lib/nginx/scgi
-RUN touch /var/log/nginx/access.log /var/log/nginx/error.log
-RUN chown -R "${USER_ID}:${USER_ID}" /app /var/log/nginx/access.log /var/log/nginx/error.log
+RUN mkdir -p /var/run/supervisor /var/log/supervisor 
+RUN chown "${USER_ID}:${USER_ID}" /var/run/supervisor /var/log/supervisor
 RUN chmod 777 /tmp
 
 USER $USER
 
-ENV FLASK_ENV=development
-
-EXPOSE 5000
+EXPOSE 3000
 
-CMD /app/init.sh
+CMD /usr/bin/supervisord -c supervisor.conf

README.md

@@ -6,53 +6,8 @@ colorTo: blue
 sdk: docker
 pinned: false
 license: mit
-app_port: 5000
+app_port: 3000
 ---
 
 
-# Flask Redirect App
-
-This simple Flask application redirects any requests to the root URL to https://dongsiqie.me.
-
-## Pre-requisites
-
-Make sure you have Docker installed on your system. You can download it from [Docker's official website](https://docker.com).
-
-## Build Instructions
-
-To build the Docker image for this application, run the following command:
-
-```bash
-docker build -t flask-redirect-app .
-```
-
-This will use the `Dockerfile` in the current directory to build an image named `flask-redirect-app`.
-
-## Running the Application
-
-Once the image has been built, you can start a container with:
-
-```bash
-docker run -dp 5000:5000 flask-redirect-app
-```
-
-The application will be accessible at `http://localhost:5000` and will redirect to https://dongsiqie.me.
-
-## Stopping the Application
-
-To stop the running container, first list all running containers with:
-
-```bash
-docker ps
-```
-
-Find the container running the `flask-redirect-app` and note the CONTAINER ID. Then run:
-
-```bash
-docker stop CONTAINER_ID
-```
-
-Replace `CONTAINER_ID` with the actual ID of your container.
-
-
-
+# BingAPI Demo

app.py

@@ -1,14 +0,0 @@
-from flask import Flask, redirect
-
-app = Flask(__name__)
-
-@app.route('/<path:subpath>')
-def subpath(subpath):
-    return redirect('https://dongsiqie.me', code=302)
-
-@app.route('/')
-def index():
-    return redirect('https://dongsiqie.me', code=302)
-
-if __name__ == '__main__':
-    app.run()

init.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-tmpUpstreamServerConfig=""
-tmpSupervisorConfig=""
-tmpPort=18080
-
-IFS=";" read -ra PARTS <<< "$UPSTREAM_SERVERS"
-for i in "${PARTS[@]}"; do
-    tmpUpstreamServerConfig=$tmpUpstreamServerConfig"\nserver 127.0.0.1:$tmpPort fail_timeout=600s max_fails=3;"
-    tmpSupervisorConfig=$tmpSupervisorConfig"\n\n[program:$i]\ncommand=/app/cloudflared access tcp --hostname $i --listener localhost:$tmpPort\ndirectory=/app\nstdout_logfile=/dev/stdout\nstderr_logfile=/dev/stderr\nautostart=true\nautorestart=true\nstartsecs=5\nstopwaitsecs = 5\nkillasgroup=true"
-    tmpPort=$((tmpPort+1))
-done
-
-echo $tmpUpstreamServerConfig
-
-sed -i "s|{{UPSTREAM_SERVERS}}|$tmpUpstreamServerConfig|g" /app/nginx.conf
-sed -i "s|{{SUPERVISOR_CONFIG}}|$tmpSupervisorConfig|g" /app/supervisor.conf
-
-echo "############ Supervisor Conf ############"
-cat /app/supervisor.conf
-
-echo -e "\n############ Nginx Conf ############"
-cat /app/nginx.conf
-
-/usr/bin/supervisord -c supervisor.conf

nginx.conf

@@ -1,108 +0,0 @@
-user user;
-daemon off;
-worker_processes auto;
-pid /tmp/nginx.pid;
-error_log /app/error.log;
-
-events {
-    worker_connections 1024;
-    # multi_accept on;
-}
-
-http {
-    ##
-    # Basic Settings
-    ##
-
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 65;
-    types_hash_max_size 2048;
-    # server_tokens off;
-
-    client_max_body_size 512m;
-
-    # server_names_hash_bucket_size 64;
-    # server_name_in_redirect off;
-
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-
-    ##
-    # SSL Settings
-    ##
-
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE
-    ssl_prefer_server_ciphers on;
-
-    ##
-    # Logging Settings
-    ##
-
-    # access_log /dev/stdout;
-    # error_log /dev/stderr;
-
-    ##
-    # Gzip Settings
-    ##
-
-    gzip on;
-
-    # gzip_vary on;
-    # gzip_proxied any;
-    # gzip_comp_level 6;
-    # gzip_buffers 16 8k;
-    # gzip_http_version 1.1;
-    # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        '' close;
-    }
-    map $remote_addr $proxy_forwarded_elem {
-        # IPv4 addresses can be sent as-is
-        ~^[0-9.]+$        "for=$remote_addr";
-    
-        # IPv6 addresses need to be bracketed and quoted
-        ~^[0-9A-Fa-f:.]+$ "for=\"[$remote_addr]\"";
-    
-        # Unix domain socket names cannot be represented in RFC 7239 syntax
-        default           "for=unknown";
-    }
-    map $http_forwarded $proxy_add_forwarded {
-        default "$proxy_forwarded_elem";
-    }
-
-    proxy_next_upstream_tries 3;
-
-    upstream azureServer {
-        {{UPSTREAM_SERVERS}}
-    }
-
-    server {
-        listen 48080;
-
-        location / {
-            proxy_pass http://azureServer;    # 你部署的地址和端口
-            proxy_http_version        1.1;
-            # proxy_cache_bypass      $http_upgrade;
-
-            # Proxy headers
-            proxy_set_header Upgrade             $http_upgrade;
-            proxy_set_header Connection          $connection_upgrade;
-            proxy_set_header Host                $host;
-            proxy_set_header X-Real-IP           $remote_addr;
-            proxy_set_header Forwarded           $proxy_add_forwarded;
-            proxy_set_header X-Forwarded-For     $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto   $scheme;
-            proxy_set_header X-Forwarded-Host    $host;
-            proxy_set_header X-Forwarded-Port    $server_port;
-
-            # Proxy timeouts
-            proxy_connect_timeout    60s;
-            proxy_send_timeout       60s;
-            proxy_read_timeout       60s;
-        }
-    }
-}

supervisor.conf

@@ -16,9 +16,9 @@ supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
 [supervisorctl]
 serverurl=http://127.0.0.1:9005
 
-[program:flask]
-command=flask run --host=0.0.0.0
-directory=/app
+[program:nextChat]
+command=npm run start
+directory=/app/BingAPI-Demo
 stdout_logfile=/dev/stdout
 stderr_logfile=/dev/stderr
 autostart=true
@@ -27,8 +27,9 @@ startsecs=5
 stopwaitsecs = 5
 killasgroup=true
 
-[program:nginx]
-command=nginx -c /app/nginx.conf
+[program:gpb]
+command=/app/go-proxy-bingai
+environment=PORT=8080,LOCAL_MODE=true
 directory=/app
 stdout_logfile=/dev/stdout
 stderr_logfile=/dev/stderr
@@ -48,5 +49,3 @@ autorestart=true
 startsecs=5
 stopwaitsecs = 5
 killasgroup=true
-
-{{SUPERVISOR_CONFIG}}