Compare commits

...

3 Commits

Author SHA1 Message Date
Rafi
c9615ed05c catch error detail in signup page 2023-03-15 11:12:05 +08:00
Rafi
0d4b6247e2 docker-compose.yml includes restart: always in each service 2023-03-14 16:04:59 +08:00
Rafi
c9c3431cff Update deployment.sh 2023-03-14 13:00:23 +08:00
3 changed files with 35 additions and 6 deletions

View File

@@ -1,6 +1,28 @@
#!/bin/bash
read -p "Please enter a resolved domain name: " domain
read -p "Please enter a domain name or external IP address [default: localhost]: " APP_DOMAIN
if [ -z "$APP_DOMAIN" ]; then
APP_DOMAIN="localhost"
fi
read -p "Please set a port for the frontend server [default: 80]: " CLIENT_PORT
if [ -z "$CLIENT_PORT" ]; then
CLIENT_PORT="80"
fi
read -p "Please set a port for the backend server [default: 9000]: " SERVER_PORT
if [ -z "$SERVER_PORT" ]; then
SERVER_PORT="9000"
fi
read -p "Please set a port for the backend WSGI server [default: 8000]: " WSGI_PORT
if [ -z "$WSGI_PORT" ]; then
WSGI_PORT="8000"
fi
if [[ $(which docker) ]]; then
echo "Docker is already installed"
@@ -43,6 +65,6 @@ sudo curl -L "https://raw.githubusercontent.com/WongSaang/chatgpt-ui/main/docker
echo "Starting services..."
sudo APP_DOMAIN="${domain}:9000" docker-compose up -d
sudo APP_DOMAIN="${APP_DOMAIN}:${SERVER_PORT}" CLIENT_PORT=${CLIENT_PORT} SERVER_PORT=${SERVER_PORT} WSGI_PORT=${WSGI_PORT} docker-compose up --pull -d
echo "Done"

View File

@@ -10,9 +10,10 @@ services:
depends_on:
- backend-web-server
ports:
- '80:80'
- '${CLIENT_PORT:-80}:80'
networks:
- chatgpt_ui_network
restart: always
backend-wsgi-server:
image: wongsaang/chatgpt-ui-wsgi-server:latest
environment:
@@ -28,19 +29,21 @@ services:
# - EMAIL_HOST_PASSWORD=
# - EMAIL_USE_TLS=True
ports:
- '8000:8000'
- '${WSGI_PORT:-8000}:8000'
networks:
- chatgpt_ui_network
restart: always
backend-web-server:
image: wongsaang/chatgpt-ui-web-server:latest
environment:
- BACKEND_URL=http://backend-wsgi-server:8000
ports:
- '9000:80'
- '${SERVER_PORT:-9000}:80'
depends_on:
- backend-wsgi-server
networks:
- chatgpt_ui_network
restart: always
networks:
chatgpt_ui_network:

View File

@@ -67,7 +67,11 @@ const submit = async () => {
errorMsg.value = error.value.data.non_field_errors[0]
}
} else {
errorMsg.value = 'Something went wrong. Please try again.'
if (error.value.data.detail) {
errorMsg.value = error.value.data.detail
} else {
errorMsg.value = 'Something went wrong. Please try again.'
}
}
} else {
$auth.setUser(data.value.user)