fix: setup script and compose

This commit is contained in:
yusing 2025-04-29 09:24:22 +08:00
parent 33e400a17e
commit 0029cf69d6
2 changed files with 6 additions and 8 deletions

View file

@ -9,6 +9,7 @@ services:
- ALLOW_RESTARTS=1 - ALLOW_RESTARTS=1
- CONTAINERS=1 - CONTAINERS=1
- EVENTS=1 - EVENTS=1
- INFO=1
- PING=1 - PING=1
- POST=1 - POST=1
- VERSION=1 - VERSION=1
@ -19,12 +20,6 @@ services:
- /run - /run
ports: ports:
- ${SOCKET_PROXY_LISTEN_ADDR:-127.0.0.1:2375}:2375 - ${SOCKET_PROXY_LISTEN_ADDR:-127.0.0.1:2375}:2375
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:2375"]
interval: 1m30s
timeout: 30s
retries: 5
start_period: 30s
frontend: frontend:
image: ghcr.io/yusing/godoxy-frontend:${TAG:-latest} image: ghcr.io/yusing/godoxy-frontend:${TAG:-latest}
container_name: godoxy-frontend container_name: godoxy-frontend
@ -60,6 +55,9 @@ services:
network_mode: host # do not change this network_mode: host # do not change this
env_file: .env env_file: .env
user: ${GODOXY_UID:-1000}:${GODOXY_GID:-1000} user: ${GODOXY_UID:-1000}:${GODOXY_GID:-1000}
depends_on:
socket-proxy:
condition: service_started
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:

View file

@ -24,7 +24,7 @@ if [ "$EUID" -eq 0 ]; then
fi fi
# check if user has docker permission # check if user has docker permission
if [ -z "$(docker ps >/dev/null 2>&1)" ]; then if ! docker ps > /dev/null 2>&1; then
echo "Error: User $USER does not have permission to run docker, please add it to docker group" echo "Error: User $USER does not have permission to run docker, please add it to docker group"
exit 1 exit 1
fi fi
@ -206,7 +206,7 @@ echo "Setting up login user"
ask_while_empty "Enter login username: " LOGIN_USERNAME ask_while_empty "Enter login username: " LOGIN_USERNAME
ask_while_empty "Enter login password: " LOGIN_PASSWORD ask_while_empty "Enter login password: " LOGIN_PASSWORD
echo "Setting up login user \"$LOGIN_USERNAME\" with password \"$LOGIN_PASSWORD\"" echo "Setting up login user \"$LOGIN_USERNAME\" with password \"$LOGIN_PASSWORD\""
setenv "GODOXY_API_USERNAME" "$LOGIN_USERNAME" setenv "GODOXY_API_USER" "$LOGIN_USERNAME"
setenv "GODOXY_API_PASSWORD" "$LOGIN_PASSWORD" setenv "GODOXY_API_PASSWORD" "$LOGIN_PASSWORD"
# 6. setup autocert # 6. setup autocert